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

diff --git a/render.h b/render.h
index c3a5e09a..09dbcd44 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 matrix4x4_t r_identitymatrix;
+
 // 1.0f / N table
 extern float ixtable[4096];
 
@@ -32,14 +34,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 +53,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;
@@ -79,7 +77,7 @@ 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;
 
 
 //
@@ -111,11 +109,6 @@ void R_InitSky (qbyte *src, int bytesperpixel); // called at level load
 void R_NewMap (void);
 
 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);
@@ -132,9 +125,8 @@ void R_DrawSpriteModel (entity_render_t *ent);
 
 //#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 emins, const vec3_t emaxs);
+int R_NotCulledBox(const vec3_t emins, const vec3_t emaxs);
 
 extern qboolean fogenabled;
 extern vec3_t fogcolor;
@@ -167,10 +159,6 @@ extern cvar_t r_render;
 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"
@@ -182,7 +170,10 @@ 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_DrawCrosshair(void);
+void R_DrawWorldCrosshair(void);
+void R_Draw2DCrosshair(void);
+
+void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width);
 
 #endif