console parsing now behaves like qwcl, thanks to Fuh for pointing out the problems...

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index b8c6b84806e02e1d1883cb56bc8183a09677d18e..33d3acd70cdb74f51723eea1add94c0a9829bf06 100644 (file)
--- a/render.h
+++ b/render.h
@@ -90,10 +90,11 @@ extern      int             c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c
 //
 // view origin
 //
-extern vec3_t  vup;
-extern vec3_t  vpn;
-extern vec3_t  vright;
-extern vec3_t  r_origin;
+extern vec3_t  r_vieworigin;
+extern vec3_t  r_viewforward;
+extern vec3_t  r_viewleft;
+extern vec3_t  r_viewright;
+extern vec3_t  r_viewup;
 
 extern mleaf_t         *r_viewleaf, *r_oldviewleaf;
 extern unsigned short  d_lightstylevalue[256]; // 8.8 fraction of base light value
@@ -106,7 +107,6 @@ extern cvar_t r_speeds;
 extern cvar_t r_fullbright;
 extern cvar_t r_wateralpha;
 extern cvar_t r_dynamic;
-extern cvar_t r_dlightmap;
 extern cvar_t r_drawcollisionbrushes;
 
 void R_Init (void);
@@ -130,7 +130,7 @@ int R_CullBox(const vec3_t mins, const vec3_t maxs);
 extern qboolean fogenabled;
 extern vec3_t fogcolor;
 extern vec_t fogdensity;
-#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_origin[0])*((v)[0] - r_origin[0])+((v)[1] - r_origin[1])*((v)[1] - r_origin[1])+((v)[2] - r_origin[2])*((v)[2] - r_origin[2])))))
+#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_vieworigin[0])*((v)[0] - r_vieworigin[0])+((v)[1] - r_vieworigin[1])*((v)[1] - r_vieworigin[1])+((v)[2] - r_vieworigin[2])*((v)[2] - r_vieworigin[2])))))
 #define calcfogbyte(v) ((qbyte) (bound(0, ((int) ((float) (calcfog((v)) * 255.0f))), 255)))
 
 // start a farclip measuring session
@@ -148,8 +148,6 @@ void R_Mesh_EnlargeFarClipBBox(vec3_t mins, vec3_t maxs);
 
 #include "meshqueue.h"
 
-extern float overbrightscale;
-
 #include "r_lerpanim.h"
 
 extern cvar_t r_render;