Major update, been neglecting CVS for some time...

[xonotic/darkplaces.git] / glquake.h

diff --git a/glquake.h b/glquake.h
index c9e0e039906f944f4de6f7fcd0524bbe62a8a902..7a521f1c25cb064b3a9df445ff094483f034f2ef 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -73,11 +73,9 @@ extern void R_TimeRefresh_f (void);
 //====================================================
 
 
-extern entity_t        r_worldentity;
 extern qboolean        r_cache_thrash;         // compatability
 extern vec3_t          modelorg, r_entorigin;
 extern entity_t        *currententity;
-extern int                     r_visframecount;        // ??? what difs?
 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;
@@ -96,20 +94,16 @@ extern      vec3_t  r_origin;
 //
 extern refdef_t        r_refdef;
 extern mleaf_t         *r_viewleaf, *r_oldviewleaf;
-extern texture_t       *r_notexture_mip;
 extern unsigned short  d_lightstylevalue[256]; // 8.8 fraction of base light value
 
 extern qboolean        envmap;
 
-extern int     skytexturenum;          // index in cl.loadmodel, not gl texture object
-
 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_novis;
 extern cvar_t  r_waterripple;
 
 extern float   r_world_matrix[16];
@@ -161,40 +155,3 @@ extern void (GLAPIENTRY *qglUnlockArraysEXT) (void);
 //#endif
 
 #endif
-
-// LordHavoc: vertex transform
-#include "transform.h"
-
-// LordHavoc: transparent polygon system
-#include "gl_poly.h"
-
-#define gl_solid_format 3
-#define gl_alpha_format 4
-
-//#define PARANOID
-
-// 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)
-
-extern qboolean fogenabled;
-extern vec3_t fogcolor;
-extern vec_t fogdensity;
-//#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_refdef.vieworg[0]) * vpn[0] + ((v)[1] - r_refdef.vieworg[1]) * vpn[1] + ((v)[2] - r_refdef.vieworg[2]) * vpn[2])*(((v)[0] - r_refdef.vieworg[0]) * vpn[0] + ((v)[1] - r_refdef.vieworg[1]) * vpn[1] + ((v)[2] - r_refdef.vieworg[2]) * vpn[2]))))
-#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_refdef.vieworg[0])*((v)[0] - r_refdef.vieworg[0])+((v)[1] - r_refdef.vieworg[1])*((v)[1] - r_refdef.vieworg[1])+((v)[2] - r_refdef.vieworg[2])*((v)[2] - r_refdef.vieworg[2])))))
-#define calcfogbyte(v) ((byte) (bound(0, ((int) ((float) (calcfog((v)) * 255.0f))), 255)))
-
-#include "r_modules.h"
-
-extern qboolean lighthalf;
-
-#include "r_lerpanim.h"
-
-void GL_LockArray(int first, int count);
-void GL_UnlockArray();
-
-void R_DrawAliasModel (entity_t *ent, int cull, float alpha, model_t *clmodel, frameblend_t *blend, int skin, vec3_t org, vec3_t angles, vec_t scale, int effects, int flags, int colormap);
-
-extern cvar_t r_render;
-extern cvar_t r_upload;
-#include "image.h"