X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=33d3acd70cdb74f51723eea1add94c0a9829bf06;hp=c3a5e09a92536a39b6d8e2de7844758ba2daede6;hb=d6852834938f79734277cd4fe3f2a34d85e55b83;hpb=cf93d91077855abf71419763e56bc774bc3b244f

diff --git a/render.h b/render.h
index c3a5e09a..33d3acd7 100644
--- a/render.h
+++ b/render.h
@@ -21,6 +21,10 @@ 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
 extern float ixtable[4096];
 
@@ -32,14 +36,13 @@ extern void FOG_clear(void);
 extern float fog_density, fog_red, fog_green, fog_blue;
 
 // sky stuff
-extern int R_SetSkyBox(char* sky);
 extern cvar_t r_sky;
-// these are exposed because surface rendering uses them
-extern rtexture_t *solidskytexture;
-extern rtexture_t *alphaskytexture;
 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)
 extern void SHOWLMP_decodehide(void);
@@ -52,10 +55,7 @@ extern qboolean intimerefresh;
 extern char r_speeds_string[1024];
 
 // lighting stuff
-extern vec3_t lightspot;
 extern cvar_t r_ambient;
-extern int lightscalebit;
-extern float lightscale;
 
 // model rendering stuff
 extern float *aliasvert;
@@ -68,6 +68,11 @@ extern cvar_t r_novis;
 // detail texture stuff
 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);
 void R_FillColors(float *out, int verts, float r, float g, float b, float a);
@@ -79,28 +84,30 @@ void R_FillColors(float *out, int verts, float r, float g, float b, float a);
 
 extern	int			r_framecount;
 extern	mplane_t	frustum[4];
-extern	int		c_brush_polys, c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
+extern	int		c_alias_polys, c_light_polys, c_faces, c_nodes, c_leafs, c_models, c_bmodels, c_sprites, c_particles, c_dlights;
 
 
 //
 // 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
 
 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_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
@@ -108,38 +115,22 @@ void R_RenderView (void); // must set r_refdef first
 
 void R_InitSky (qbyte *src, int bytesperpixel); // called at level load
 
-void R_NewMap (void);
-
+void R_WorldVisibility(entity_render_t *ent);
 void R_DrawWorld(entity_render_t *ent);
-void R_SetupForWorldRendering(entity_render_t *ent);
-void R_MarkWorldLights(entity_render_t *ent);
-void R_PrepareSurfaces(entity_render_t *ent);
-void R_DrawSurfaces(entity_render_t *ent, int type);
-void R_DrawPortals(entity_render_t *ent);
 void R_DrawParticles(void);
 void R_DrawExplosions(void);
-void R_DrawBrushModelSky (entity_render_t *ent);
-void R_DrawBrushModelNormal (entity_render_t *ent);
-void R_DrawZymoticModel (entity_render_t *ent);
-void R_DrawQ1Q2AliasModel(entity_render_t *ent);
-void R_DrawSpriteModel (entity_render_t *ent);
-
-// LordHavoc: vertex transform
-#include "transform.h"
 
 #define gl_solid_format 3
 #define gl_alpha_format 4
 
 //#define PARANOID 1
 
-// LordHavoc: was a major time waster
-#define R_CullBox(mins,maxs) (frustum[0].BoxOnPlaneSideFunc(mins, maxs, &frustum[0]) == 2 || frustum[1].BoxOnPlaneSideFunc(mins, maxs, &frustum[1]) == 2 || frustum[2].BoxOnPlaneSideFunc(mins, maxs, &frustum[2]) == 2 || frustum[3].BoxOnPlaneSideFunc(mins, maxs, &frustum[3]) == 2)
-#define R_NotCulledBox(mins,maxs) (frustum[0].BoxOnPlaneSideFunc(mins, maxs, &frustum[0]) != 2 && frustum[1].BoxOnPlaneSideFunc(mins, maxs, &frustum[1]) != 2 && frustum[2].BoxOnPlaneSideFunc(mins, maxs, &frustum[2]) != 2 && frustum[3].BoxOnPlaneSideFunc(mins, maxs, &frustum[3]) != 2)
+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
@@ -157,20 +148,13 @@ 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;
-#include "image.h"
 
 extern cvar_t r_textureunits;
 extern cvar_t gl_dither;
 
-// FIXME: this should live in the backend only
-void GL_LockArray(int first, int count);
-void GL_UnlockArray(void);
-
 #include "gl_backend.h"
 
 #include "r_light.h"
@@ -180,9 +164,13 @@ void R_TimeReport_Start(void);
 void R_TimeReport_End(void);
 
 // r_stain
-void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2);
+void R_Stain(const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2);
+
+void R_DrawWorldCrosshair(void);
+void R_Draw2DCrosshair(void);
 
-void R_DrawCrosshair(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);
 
 #endif