X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=render.h;h=6a4fa824a8a0db212dc616ba1a07ecde5389976d;hb=53e139b91d2161c1db8b427878d21c4f09b33f88;hp=2bd3e247844fff2291a4a21fbbf717884c4cd0e1;hpb=db0e59eeca766dc6c747f546a682c56c15db8e32;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index 2bd3e247..6a4fa824 100644
--- a/render.h
+++ b/render.h
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef RENDER_H
 #define RENDER_H
 
+extern qbyte r_pvsbits[(MAX_MAP_LEAFS+7)>>3];
+
 extern matrix4x4_t r_identitymatrix;
 
 // 1.0f / N table
@@ -35,6 +37,8 @@ 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);
@@ -55,11 +59,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;
 
@@ -69,6 +68,7 @@ extern cvar_t r_detailtextures;
 extern cvar_t r_lerpsprites;
 extern cvar_t r_lerpmodels;
 extern cvar_t r_waterscroll;
+extern cvar_t r_watershader;
 
 // useful functions for rendering
 void R_ModulateColors(float *in, float *out, int verts, float r, float g, float b);
@@ -83,30 +83,44 @@ 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;
 
+// forces all rendering to draw triangle outlines
+extern cvar_t r_showtris;
+extern int r_showtrispass;
 
 //
 // 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 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
 
 extern	qboolean	envmap;
 
-extern	cvar_t	r_drawentities;
-extern	cvar_t	r_drawviewmodel;
-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_drawentities;
+extern cvar_t r_drawviewmodel;
+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_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
@@ -122,38 +136,25 @@ void R_DrawExplosions(void);
 //#define PARANOID 1
 
 int R_CullBox(const vec3_t mins, const vec3_t maxs);
-int PVS_CullBox(const vec3_t mins, const vec3_t maxs);
-int R_CullSphere(const vec3_t origin, vec_t radius);
-int PVS_CullSphere(const vec3_t origin, vec_t radius);
+#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;
 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
-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"
 
-extern float overbrightscale;
-
 #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"