changed behavior of r_showtris (now only affects geometry in the game view, not sky...

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 4254877e204374c95eff6a4474400cda13fe1879..d93176407810ab60c9df6e10afff7cab48d79e52 100644 (file)
--- a/render.h
+++ b/render.h
@@ -24,11 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // flag arrays used for visibility checking on world model
 // (all other entities have no per-surface/per-leaf visibility checks)
 // TODO: dynamic resize according to r_refdef.worldmodel->brush.num_clusters
-extern qbyte r_pvsbits[(32768+7)>>3];
+extern unsigned char r_pvsbits[(32768+7)>>3];
 // TODO: dynamic resize according to r_refdef.worldmodel->brush.num_leafs
-extern qbyte r_worldleafvisible[32768];
+extern unsigned char r_worldleafvisible[32768];
 // TODO: dynamic resize according to r_refdef.worldmodel->num_surfaces
-extern qbyte r_worldsurfacevisible[262144];
+extern unsigned char r_worldsurfacevisible[262144];
 
 extern matrix4x4_t r_identitymatrix;
 
@@ -146,6 +146,14 @@ extern qboolean r_rtdlightshadows;
 
 // forces all rendering to draw triangle outlines
 extern cvar_t r_showtris;
+extern cvar_t r_showtris_polygonoffset;
+extern cvar_t r_shownormals;
+extern cvar_t r_showlighting;
+extern cvar_t r_showshadowvolumes;
+extern cvar_t r_showcollisionbrushes;
+extern cvar_t r_showcollisionbrushes_polygonfactor;
+extern cvar_t r_showcollisionbrushes_polygonoffset;
+extern cvar_t r_showdisabledepthtest;
 extern int r_showtrispass;
 
 //
@@ -162,8 +170,6 @@ 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;
@@ -176,14 +182,13 @@ extern cvar_t r_speeds;
 extern cvar_t r_fullbright;
 extern cvar_t r_wateralpha;
 extern cvar_t r_dynamic;
-extern cvar_t r_drawcollisionbrushes;
 
 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
+void R_InitSky (unsigned char *src, int bytesperpixel); // called at level load
 
 void R_WorldVisibility();
 void R_DrawParticles(void);
@@ -194,11 +199,16 @@ void R_DrawExplosions(void);
 
 int R_CullBox(const vec3_t mins, const vec3_t maxs);
 
-extern qboolean fogenabled;
+#define FOGTABLEWIDTH 1024
 extern vec3_t fogcolor;
 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)))
+extern vec_t fogrange;
+extern vec_t fograngerecip;
+extern int fogtableindex;
+extern vec_t fogtabledistmultiplier;
+extern float fogtable[FOGTABLEWIDTH];
+extern qboolean fogenabled;
+#define VERTEXFOGTABLE(dist) (fogtableindex = (int)((dist) * fogtabledistmultiplier), fogtable[bound(0, fogtableindex, FOGTABLEWIDTH - 1)])
 
 #include "r_modules.h"
 
@@ -225,6 +235,8 @@ extern rtexture_t *r_texture_black;
 extern rtexture_t *r_texture_notexture;
 extern rtexture_t *r_texture_whitecube;
 extern rtexture_t *r_texture_normalizationcube;
+extern rtexture_t *r_texture_fogattenuation;
+extern rtexture_t *r_texture_fogintensity;
 
 void R_TimeReport(char *name);
 void R_TimeReport_Start(void);
@@ -237,7 +249,7 @@ void R_DrawWorldCrosshair(void);
 void R_Draw2DCrosshair(void);
 
 void R_CalcBeam_Vertex3f(float *vert, const vec3_t org1, const vec3_t org2, float width);
-void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, int depthdisable, const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2, float cr, float cg, float cb, float ca);
+void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, rtexture_t *fogtexture, int depthdisable, const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2, float cr, float cg, float cb, float ca);
 
 struct entity_render_s;
 struct texture_s;