added back r_speeds2, with masses of information (6 lines high), and made it print...

[xonotic/darkplaces.git] / render.h

diff --git a/render.h b/render.h
index 78289b5e137395a6d8ff3078789806efb4c3a0f2..c713eb4041b07dcf725427c83dcdb23a6b77ed72 100644 (file)
--- a/render.h
+++ b/render.h
@@ -68,7 +68,7 @@ typedef struct entity_s
        struct efrag_s                  *efrag;                 // linked list of efrags
        int                                             frame;
        float                                   syncbase;               // for client-side animations
-       byte                                    *colormap;
+       int                                             colormap;
        int                                             effects;                // light, particals, etc
        int                                             skinnum;                // for Alias models
        int                                             visframe;               // last frame this entity was
@@ -119,7 +119,6 @@ typedef struct
 //
 // refresh
 //
-extern int             reinit_surfcache;
 
 
 extern refdef_t        r_refdef;
@@ -127,51 +126,42 @@ extern vec3_t     r_origin, vpn, vright, vup;
 
 extern struct texture_s        *r_notexture_mip;
 
-// LordHavoc: generic image loader
-byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
-int loadtextureimage (int texnum, char* filename, qboolean complain, int matchwidth, int matchheight);
-
-void R_Init (void);
-void R_InitTextures (void);
-void R_InitEfrags (void);
-void R_RenderView (void);              // must set r_refdef first
-void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect);
+extern void R_Init (void);
+extern void R_InitTextures (void);
+extern void R_InitEfrags (void);
+extern void R_RenderView (void);               // must set r_refdef first
+extern void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect);
                                                                // called whenever r_refdef or vid change
 // LordHavoc: changed this for sake of GLQuake
-void R_InitSky (byte *src, int bytesperpixel); // called at level load
-//void R_InitSky (struct texture_s *mt);       // called at level load
-
-void R_AddEfrags (entity_t *ent);
-void R_RemoveEfrags (entity_t *ent);
-
-void R_NewMap (void);
-
-
-void R_ParseParticleEffect (void);
-void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
-void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent);
-void R_RocketTrail2 (vec3_t start, vec3_t end, int type, entity_t *ent);
-void R_SparkShower (vec3_t org, vec3_t dir, int count, int type);
-
-void R_EntityParticles (entity_t *ent);
-void R_BlobExplosion (vec3_t org);
-void R_ParticleExplosion (vec3_t org, int smoke);
-void R_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength);
-void R_LavaSplash (vec3_t org);
-void R_TeleportSplash (vec3_t org);
-
-void R_PushDlights (void);
-
-
-//
-// surface cache related
-//
-extern int             reinit_surfcache;       // if 1, surface cache is currently empty and
-extern qboolean        r_cache_thrash; // set if thrashing the surface cache
-
-int    D_SurfaceCacheForRes (int width, int height);
-void D_FlushCaches (void);
-void D_DeleteSurfaceCache (void);
-void D_InitCaches (void *buffer, int size);
-void R_SetVrect (vrect_t *pvrect, vrect_t *pvrectin, int lineadj);
-
+extern void R_InitSky (byte *src, int bytesperpixel);  // called at level load
+//extern void R_InitSky (struct texture_s *mt);        // called at level load
+
+extern void R_AddEfrags (entity_t *ent);
+extern void R_RemoveEfrags (entity_t *ent);
+
+extern void R_NewMap (void);
+
+
+extern void R_ParseParticleEffect (void);
+extern void R_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count);
+extern void R_RocketTrail (vec3_t start, vec3_t end, int type, entity_t *ent);
+extern void R_RocketTrail2 (vec3_t start, vec3_t end, int type, entity_t *ent);
+extern void R_SparkShower (vec3_t org, vec3_t dir, int count);
+extern void R_BloodPuff (vec3_t org);
+
+extern void R_EntityParticles (entity_t *ent);
+extern void R_BlobExplosion (vec3_t org);
+extern void R_ParticleExplosion (vec3_t org, int smoke);
+extern void R_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength);
+extern void R_LavaSplash (vec3_t org);
+extern void R_TeleportSplash (vec3_t org);
+
+extern void R_PushDlights (void);
+extern void R_DrawWorld (void);
+//extern void R_RenderDlights (void);
+extern void R_DrawParticles (void);
+extern void R_MoveParticles (void);
+
+extern void R_DynamicLightPoint(vec3_t color, vec3_t org, int *dlightbits);
+extern void R_DynamicLightPointNoMask(vec3_t color, vec3_t org);
+extern void R_LightPoint (vec3_t color, vec3_t p);