X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=76400a72f2b94a30c5cc3b998deaa674722d582a;hp=7aa31b7af4218fb0bcdf2778d74c8d8db44d832c;hb=ab2ef8dd3c55aab62a9f8e5d9bcf04b376d7d6b8;hpb=f7412a0c49465d916da5920d1132eeda9c3a4a3d

diff --git a/render.h b/render.h
index 7aa31b7a..76400a72 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];
 
@@ -34,7 +36,7 @@ extern float fog_density, fog_red, fog_green, fog_blue;
 // sky stuff
 extern cvar_t r_sky;
 extern int skyrendernow, skyrendermasked;
-extern int R_SetSkyBox(char* sky);
+extern int R_SetSkyBox(const char *sky);
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
 extern void R_ResetQuakeSky(void);
@@ -51,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;
@@ -126,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;
@@ -161,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"
@@ -178,5 +172,7 @@ void R_Stain (vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, i
 
 void R_DrawCrosshair(void);
 
+void R_CalcBeamVerts (float *vert, vec3_t org1, vec3_t org2, float width);
+
 #endif