fixed r_restart skybox crash (as well as incorrect texture bugs related to this)...

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 33d3acd70cdb74f51723eea1add94c0a9829bf06..e0a6a816a17c65da34d6ae25fc89dd78c293fb24 100644 (file)
--- a/render.h
+++ b/render.h
@@ -37,11 +37,12 @@ extern float fog_density, fog_red, fog_green, fog_blue;
 
 // sky stuff
 extern cvar_t r_sky;
+extern cvar_t r_skyscroll1;
+extern cvar_t r_skyscroll2;
 extern int skyrendernow, skyrendermasked;
 extern int R_SetSkyBox(const char *sky);
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
-extern void R_ResetQuakeSky(void);
 extern void R_ResetSkyBox(void);
 
 // SHOWLMP stuff (Nehahra)
@@ -57,11 +58,6 @@ extern char r_speeds_string[1024];
 // lighting stuff
 extern cvar_t r_ambient;
 
-// model rendering stuff
-extern float *aliasvert;
-extern float *aliasvertnorm;
-extern float *aliasvertcolor;
-
 // vis stuff
 extern cvar_t r_novis;
 
@@ -86,15 +82,36 @@ extern      int                     r_framecount;
 extern mplane_t        frustum[4];
 extern int             c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
 
+// brightness of world lightmaps and related lighting
+// (often reduced when world rtlights are enabled)
+extern float r_lightmapintensity;
+// whether to draw world lights realtime, dlights realtime, and their shadows
+extern qboolean r_rtworld;
+extern qboolean r_rtworldshadows;
+extern qboolean r_rtdlight;
+extern qboolean r_rtdlightshadows;
+
+// forces all rendering to draw triangle outlines
+extern cvar_t r_showtris;
+extern int r_showtrispass;
 
 //
 // view 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 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 int r_view_x;
+extern int r_view_y;
+extern int r_view_z;
+extern int r_view_width;
+extern int r_view_height;
+extern int r_view_depth;
+extern float r_view_fov_x;
+extern float r_view_fov_y;
+extern matrix4x4_t r_view_matrix;
 
 extern mleaf_t         *r_viewleaf, *r_oldviewleaf;
 extern unsigned short  d_lightstylevalue[256]; // 8.8 fraction of base light value
@@ -109,8 +126,9 @@ extern cvar_t r_wateralpha;
 extern cvar_t r_dynamic;
 extern cvar_t r_drawcollisionbrushes;
 
-void R_Init (void);
-void R_RenderView (void); // must set r_refdef first
+void R_Init(void);
+void R_UpdateWorld(void); // needs no r_refdef
+void R_RenderView(void); // must call R_UpdateWorld and set r_refdef first
 
 
 void R_InitSky (qbyte *src, int bytesperpixel); // called at level load
@@ -126,6 +144,7 @@ void R_DrawExplosions(void);
 //#define PARANOID 1
 
 int R_CullBox(const vec3_t mins, const vec3_t maxs);
+#define VIS_CullBox(mins,maxs) (R_CullBox((mins), (maxs)) || (cl.worldmodel && cl.worldmodel->brush.BoxTouchingPVS && !cl.worldmodel->brush.BoxTouchingPVS(cl.worldmodel, r_pvsbits, (mins), (maxs))))
 
 extern qboolean fogenabled;
 extern vec3_t fogcolor;
@@ -133,17 +152,6 @@ extern vec_t fogdensity;
 #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
-void R_FarClip_Start(vec3_t origin, vec3_t direction, vec_t startfarclip);
-// enlarge farclip to accomodate box
-void R_FarClip_Box(vec3_t mins, vec3_t maxs);
-// return farclip value
-float R_FarClip_Finish(void);
-
-// updates farclip distance so it is large enough for the specified box
-// (*important*)
-void R_Mesh_EnlargeFarClipBBox(vec3_t mins, vec3_t maxs);
-
 #include "r_modules.h"
 
 #include "meshqueue.h"
@@ -151,8 +159,10 @@ void R_Mesh_EnlargeFarClipBBox(vec3_t mins, vec3_t maxs);
 #include "r_lerpanim.h"
 
 extern cvar_t r_render;
+extern cvar_t r_waterwarp;
 
 extern cvar_t r_textureunits;
+extern cvar_t gl_polyblend;
 extern cvar_t gl_dither;
 
 #include "gl_backend.h"