a rather hefty 6% speed gain by getting rid of the R_Mesh_UpdateFarClip function...

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 5df1927293bb04440583fd171ffe3f168311fceb..0496a441bba6e49b193f9ffed627b26b1c3fed1c 100644 (file)
--- a/render.h
+++ b/render.h
@@ -18,13 +18,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-// refresh.h -- public interface to refresh functions
+#ifndef RENDER_H
+#define RENDER_H
 
 // 1.0f / N table
 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);
@@ -36,7 +37,6 @@ extern cvar_t r_skyquality;
 // these are exposed because surface rendering uses them
 extern rtexture_t *solidskytexture;
 extern rtexture_t *alphaskytexture;
-extern rtexture_t *mergeskytexture;
 extern int skyrendernow, skyrendermasked, skyrenderglquake;
 extern void R_SkyStartFrame(void);
 extern void R_Sky(void);
@@ -65,15 +65,11 @@ extern float *aliasvertcolor;
 // vis stuff
 extern cvar_t r_novis;
 
-// model transform stuff
-//extern cvar_t gl_transform;
-
 #define        TOP_RANGE               16                      // soldier uniform colors
 #define        BOTTOM_RANGE    96
 
 //=============================================================================
 
-//extern       qboolean        r_cache_thrash;         // compatability
 extern entity_render_t *currentrenderentity;
 extern int                     r_framecount;
 extern mplane_t        frustum[4];
@@ -101,15 +97,11 @@ extern     cvar_t  r_wateralpha;
 extern cvar_t  r_dynamic;
 extern cvar_t  r_waterripple;
 
-//extern       float   r_world_matrix[16];
-
 void R_Init (void);
 void R_RenderView (void); // must set r_refdef first
 
 
-void R_InitSky (byte *src, int bytesperpixel); // called at level load
-
-//int R_VisibleCullBox (vec3_t mins, vec3_t maxs);
+void R_InitSky (qbyte *src, int bytesperpixel); // called at level load
 
 void R_NewMap (void);
 
@@ -122,15 +114,13 @@ void R_DrawPortals(void);
 void R_DrawParticles(void);
 void R_DrawExplosions(void);
 
-#include "r_clip.h"
-
 // LordHavoc: vertex transform
 #include "transform.h"
 
 #define gl_solid_format 3
 #define gl_alpha_format 4
 
-//#define PARANOID
+//#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)
@@ -139,9 +129,19 @@ void R_DrawExplosions(void);
 extern qboolean fogenabled;
 extern vec3_t fogcolor;
 extern vec_t fogdensity;
-//#define calcfog(v) (exp(-(fogdensity*fogdensity*(((v)[0] - r_origin[0]) * vpn[0] + ((v)[1] - r_origin[1]) * vpn[1] + ((v)[2] - r_origin[2]) * vpn[2])*(((v)[0] - r_origin[0]) * vpn[0] + ((v)[1] - r_origin[1]) * vpn[1] + ((v)[2] - r_origin[2]) * vpn[2]))))
 #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) ((byte) (bound(0, ((int) ((float) (calcfog((v)) * 255.0f))), 255)))
+#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"
 
@@ -154,11 +154,7 @@ 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;
@@ -191,3 +187,8 @@ 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);
+
+#endif
+