fixed bug which caused all models to be untextured if they used internal skins

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index a98e07d3c299c69203f09e318549e697c9882119..a22cad766adfd82bff3131bf08f86c3cea318247 100644 (file)
--- a/render.h
+++ b/render.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern float ixtable[4096];
 
 // far clip distance for scene
-extern float r_farclip, r_newfarclip;
+extern float r_farclip;
 
 // fog stuff
 extern void FOG_clear(void);
@@ -33,11 +33,11 @@ extern float fog_density, fog_red, fog_green, fog_blue;
 
 // sky stuff
 extern int R_SetSkyBox(char* sky);
-extern cvar_t r_skyquality;
+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, skyrenderglquake;
+extern int skyrendernow, skyrendermasked;
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
 
@@ -65,12 +65,18 @@ extern float *aliasvertcolor;
 // vis stuff
 extern cvar_t r_novis;
 
+// detail texture stuff
+extern cvar_t r_detailtextures;
+
+// 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);
+
 #define        TOP_RANGE               16                      // soldier uniform colors
 #define        BOTTOM_RANGE    96
 
 //=============================================================================
 
-extern entity_render_t *currentrenderentity;
 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;
@@ -95,7 +101,6 @@ extern       cvar_t  r_speeds;
 extern cvar_t  r_fullbright;
 extern cvar_t  r_wateralpha;
 extern cvar_t  r_dynamic;
-extern cvar_t  r_waterripple;
 
 void R_Init (void);
 void R_RenderView (void); // must set r_refdef first
@@ -105,16 +110,18 @@ void R_InitSky (qbyte *src, int bytesperpixel); // called at level load
 
 void R_NewMap (void);
 
-void R_DrawWorld(void);
-void R_SetupForWorldRendering(void);
-void R_MarkWorldLights(void);
-void R_PrepareSurfaces(void);
-void R_DrawSurfaces(int type);
-void R_DrawPortals(void);
+void R_DrawWorld(entity_render_t *ent);
+void R_SurfMarkLights (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);
-
-#include "r_clip.h"
+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"
@@ -134,25 +141,29 @@ 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 calcfogbyte(v) ((qbyte) (bound(0, ((int) ((float) (calcfog((v)) * 255.0f))), 255)))
 
+// start a farclip measuring session
+void R_FarClip_Start(vec3_t origin, vec3_t direction, vec_t startfarclip);
+// enlarge farclip to accomodate box
+void R_FarClip_Box(vec3_t mins, vec3_t maxs);
+// return farclip value
+float R_FarClip_Finish(void);
+
+// updates farclip distance so it is large enough for the specified box
+// (*important*)
+void R_Mesh_EnlargeFarClipBBox(vec3_t mins, vec3_t maxs);
+
 #include "r_modules.h"
 
+#include "meshqueue.h"
+
 extern float overbrightscale;
 
 #include "r_lerpanim.h"
 
-void R_DrawBrushModelSky (void);
-void R_DrawBrushModelNormal (void);
-void R_DrawAliasModel (void);
-void R_DrawSpriteModel (void);
-
-void R_ClipSprite (void);
-void R_Entity_Callback(void *data, void *junk);
-
 extern cvar_t r_render;
-extern cvar_t r_ser;
 #include "image.h"
 
-extern cvar_t r_multitexture;
+extern cvar_t r_textureunits;
 extern cvar_t gl_dither;
 
 // FIXME: this should live in the backend only
@@ -163,19 +174,6 @@ void GL_UnlockArray(void);
 
 #include "r_light.h"
 
-extern rtexture_t *particlefonttexture;
-
-// particletexture_t is a rectangle in the particlefonttexture
-typedef struct
-{
-       float s1, t1, s2, t2;
-}
-particletexture_t;
-
-#define MAX_PARTICLETEXTURES 64
-// [0] is normal, [1] is fog, they may be the same
-extern particletexture_t particletexture[MAX_PARTICLETEXTURES][2];
-
 void R_TimeReport(char *name);
 void R_TimeReport_Start(void);
 void R_TimeReport_End(void);