X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=client.h;h=02053f21ae23cf989e0098eade28db0826b17dcc;hb=544356c7bb6288760533142b8ab402f4d8d966ef;hp=246d425eb4fdb2aa990daeff040c1d88b8b6f34a;hpb=e58c97216056b93c9e3674be6cbd6abc5903cc57;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 246d425e..02053f21 100644
--- a/client.h
+++ b/client.h
@@ -259,8 +259,6 @@ typedef struct entity_render_s
 
 	// calculated by the renderer (but not persistent)
 
-	// if visframe == r_framecount, it is visible
-	int visframe;
 	// calculated during R_AddModelEntities
 	vec3_t mins, maxs;
 	// 4 frame numbers (-1 if not used) and their blending scalers (0-1), if interpolation is not desired, use frame instead
@@ -1132,21 +1130,47 @@ void R_NewExplosion(const vec3_t org);
 #define NUMCROSSHAIRS 32
 extern cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
 
-typedef struct refdef_s
+#define FOGTABLEWIDTH 1024
+extern int fogtableindex;
+#define VERTEXFOGTABLE(dist) (fogtableindex = (int)((dist) * r_refdef.fogtabledistmultiplier), r_refdef.fogtable[bound(0, fogtableindex, FOGTABLEWIDTH - 1)])
+
+typedef struct r_refdef_stats_s
 {
-	// area to render in
-	int x, y, width, height;
-	float frustum_x, frustum_y;
+	int entities;
+	int entities_surfaces;
+	int entities_triangles;
+	int world_leafs;
+	int world_portals;
+	int particles;
+	int meshes;
+	int meshes_elements;
+	int lights;
+	int lights_clears;
+	int lights_scissored;
+	int lights_lighttriangles;
+	int lights_shadowtriangles;
+	int lights_dynamicshadowtriangles;
+	int bloom;
+	int bloom_copypixels;
+	int bloom_drawpixels;
+}
+r_refdef_stats_t;
+
+typedef struct r_refdef_s
+{
+	// these fields define the basic rendering information for the world
+	// but not the view, which could change multiple times in one rendered
+	// frame (for example when rendering textures for certain effects)
 
 	// these are set for water warping before
 	// frustum_x/frustum_y are calculated
 	float frustumscale_x, frustumscale_y;
 
-	// view transform
-	matrix4x4_t viewentitymatrix;
-
-	// which color components to allow (for anaglyph glasses)
-	int colormask[4];
+	// minimum visible distance (pixels closer than this disappear)
+	double nearclip;
+	// maximum visible distance (pixels further than this disappear in 16bpp modes,
+	// in 32bpp an infinite-farclip matrix is used instead)
+	double farclip;
 
 	// fullscreen color blend
 	float viewblend[4];
@@ -1176,11 +1200,99 @@ typedef struct refdef_s
 	// controls intensity of dynamic lights and lightmap layers
 	unsigned short	lightstylevalue[256];	// 8.8 fraction of base light value
 
+	vec3_t fogcolor;
+	vec_t fogrange;
+	vec_t fograngerecip;
+	vec_t fogtabledistmultiplier;
+	float fogtable[FOGTABLEWIDTH];
+	float fog_density;
+	float fog_red;
+	float fog_green;
+	float fog_blue;
+	qboolean fogenabled;
+	qboolean oldgl_fogenable;
+
 	qboolean draw2dstage;
+
+	// true during envmap command capture
+	qboolean envmap;
+
+	// brightness of world lightmaps and related lighting
+	// (often reduced when world rtlights are enabled)
+	float lightmapintensity;
+	// whether to draw world lights realtime, dlights realtime, and their shadows
+	qboolean rtworld;
+	qboolean rtworldshadows;
+	qboolean rtdlight;
+	qboolean rtdlightshadows;
+	float polygonfactor;
+	float polygonoffset;
+	float shadowpolygonfactor;
+	float shadowpolygonoffset;
+
+	// rendering stats for r_speeds display
+	// (these are incremented in many places)
+	r_refdef_stats_t stats;
+}
+r_refdef_t;
+
+typedef struct r_view_s
+{
+	// view information (changes multiple times per frame)
+	// if any of these variables change then r_viewcache must be regenerated
+	// by calling R_View_Update
+	// (which also updates viewport, scissor, colormask)
+
+	// it is safe and expected to copy this into a structure on the stack and
+	// call the renderer recursively, then restore from the stack afterward
+	// (as long as R_View_Update is called)
+
+	// eye position information
+	matrix4x4_t matrix;
+	vec3_t origin;
+	vec3_t forward;
+	vec3_t left;
+	vec3_t right;
+	vec3_t up;
+	mplane_t frustum[5];
+	float frustum_x, frustum_y;
+
+	// screen area to render in
+	int x;
+	int y;
+	int z;
+	int width;
+	int height;
+	int depth;
+
+	// which color components to allow (for anaglyph glasses)
+	int colormask[4];
+}
+r_view_t;
+
+typedef struct r_viewcache_s
+{
+	// these properties are generated by R_View_Update()
+
+	// which entities are currently visible for this viewpoint
+	// (the used range is 0...r_refdef.numentities)
+	unsigned char entityvisible[MAX_EDICTS];
+	// 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
+	unsigned char world_pvsbits[(32768+7)>>3];
+	// TODO: dynamic resize according to r_refdef.worldmodel->brush.num_leafs
+	unsigned char world_leafvisible[32768];
+	// TODO: dynamic resize according to r_refdef.worldmodel->num_surfaces
+	unsigned char world_surfacevisible[262144];
+	// if true, the view is currently in a leaf without pvs data
+	qboolean world_novis;
 }
-refdef_t;
+r_viewcache_t;
 
-extern refdef_t r_refdef;
+extern r_refdef_t r_refdef;
+extern r_view_t r_view;
+extern r_viewcache_t r_viewcache;
 
 #endif