more q3bsp work (and no it still doesn't work right)

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 05dcd5f77652f0b7951de1d24c04448654575989..342f92b5c74ff8428e3742e6bfe8348538304bd0 100644 (file)
--- 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
@@ -53,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;
@@ -69,6 +68,10 @@ 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;
+
 // 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);
@@ -96,12 +99,14 @@ extern      unsigned short  d_lightstylevalue[256]; // 8.8 fraction of base light valu
 
 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_dlightmap;
+extern cvar_t r_drawcollisionbrushes;
 
 void R_Init (void);
 void R_RenderView (void); // must set r_refdef first
@@ -109,27 +114,17 @@ 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_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
 
-int R_CullBox(const vec3_t emins, const vec3_t emaxs);
-int R_NotCulledBox(const vec3_t emins, const vec3_t emaxs);
+int R_CullBox(const vec3_t mins, const vec3_t maxs);
 
 extern qboolean fogenabled;
 extern vec3_t fogcolor;
@@ -157,15 +152,10 @@ 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"
@@ -175,9 +165,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