Fix most Q3 & QL glow maps

[xonotic/darkplaces.git] / client.h

diff --git a/client.h b/client.h
index 02a34c0c99e3a0724eb30daf31e2917afd9f34d3..45312d96fcd95d53f97f7fbf5a4754823af9d423 100644 (file)
--- a/client.h
+++ b/client.h
@@ -343,8 +343,6 @@ typedef struct rtlight_s
        int isstatic;
        /// true if this is a compiled world light, cleared if the light changes
        int compiled;
-       /// the shadowing mode used to compile this light
-       int shadowmode;
        /// the size that this light should have (assuming no scene LOD kicking in to reduce it)
        int shadowmapsidesize;
        /// position of this light in the shadowmap atlas
@@ -986,29 +984,6 @@ typedef enum ptype_e
 }
 ptype_t;
 
-typedef struct decal_s
-{
-       // fields used by rendering:  (44 bytes)
-       unsigned short  typeindex;
-       unsigned short  texnum;
-       unsigned int    decalsequence;
-       vec3_t                  org;
-       vec3_t                  normal;
-       float                   size;
-       float                   alpha; // 0-255
-       unsigned char   color[3];
-       unsigned char   unused1;
-       int                             clusterindex; // cheap culling by pvs
-
-       // fields not used by rendering: (36 bytes in 32bit, 40 bytes in 64bit)
-       float                   time2; // used for decal fade
-       unsigned int    owner; // decal stuck to this entity
-       dp_model_t                      *ownermodel; // model the decal is stuck to (used to make sure the entity is still alive)
-       vec3_t                  relativeorigin; // decal at this location in entity's coordinate space
-       vec3_t                  relativenormal; // decal oriented this way relative to entity's coordinate space
-}
-decal_t;
-
 typedef struct particle_s
 {
        // for faster batch rendering, particles are rendered in groups by effect (resulting in less perfect sorting but far less state changes)
@@ -1325,7 +1300,6 @@ typedef struct client_state_s
        int max_lightstyle;
        int max_brushmodel_entities;
        int max_particles;
-       int max_decals;
        int max_showlmps;
 
        entity_t *entities;
@@ -1338,7 +1312,6 @@ typedef struct client_state_s
        lightstyle_t *lightstyle;
        int *brushmodel_entities;
        particle_t *particles;
-       decal_t *decals;
        showlmp_t *showlmps;
 
        int num_entities;
@@ -1560,7 +1533,7 @@ void CL_Init (void);
 void CL_EstablishConnection(const char *host, int firstarg);
 
 void CL_Disconnect (void);
-void CL_Disconnect_f (void);
+void CL_Disconnect_f(cmd_state_t *cmd);
 
 void CL_UpdateRenderEntity(entity_render_t *ent);
 void CL_SetEntityColormapColors(entity_render_t *ent, int colormap);
@@ -1624,10 +1597,10 @@ void CL_CutDemo(unsigned char **buf, fs_offset_t *filesize);
 void CL_PasteDemo(unsigned char **buf, fs_offset_t *filesize);
 
 void CL_NextDemo(void);
-void CL_Stop_f(void);
-void CL_Record_f(void);
-void CL_PlayDemo_f(void);
-void CL_TimeDemo_f(void);
+void CL_Stop_f(cmd_state_t *cmd);
+void CL_Record_f(cmd_state_t *cmd);
+void CL_PlayDemo_f(cmd_state_t *cmd);
+void CL_TimeDemo_f(cmd_state_t *cmd);
 
 //
 // cl_parse.c
@@ -1644,7 +1617,7 @@ void CL_KeepaliveMessage(qboolean readmessages); // call this during loading of
 //
 // view
 //
-void V_StartPitchDrift (void);
+void V_StartPitchDrift_f(cmd_state_t *cmd);
 void V_StopPitchDrift (void);
 
 void V_Init (void);
@@ -2037,21 +2010,18 @@ void CL_ClientMovement_PlayerMove_Frame(cl_clientmovement_state_t *s);
 void CL_RotateMoves(const matrix4x4_t *m);
 
 typedef enum meshname_e {
-       MESH_DEBUG,
-       MESH_CSQCPOLYGONS,
-       MESH_PARTICLES,
+       MESH_SCENE, // CSQC R_PolygonBegin, potentially also engine particles and debug stuff
        MESH_UI,
        NUM_MESHENTITIES,
 } meshname_t;
 extern entity_t cl_meshentities[NUM_MESHENTITIES];
 extern dp_model_t cl_meshentitymodels[NUM_MESHENTITIES];
 extern const char *cl_meshentitynames[NUM_MESHENTITIES];
-#define CL_Mesh_Debug() (&cl_meshentitymodels[MESH_DEBUG])
-#define CL_Mesh_CSQC() (&cl_meshentitymodels[MESH_CSQCPOLYGONS])
-#define CL_Mesh_Particles() (&cl_meshentitymodels[MESH_PARTICLES])
+#define CL_Mesh_Scene() (&cl_meshentitymodels[MESH_SCENE])
 #define CL_Mesh_UI() (&cl_meshentitymodels[MESH_UI])
-void CL_MeshEntities_AddToScene(void);
-void CL_MeshEntities_Reset(void);
+void CL_MeshEntities_Scene_Clear(void);
+void CL_MeshEntities_Scene_AddRenderEntity(void);
+void CL_MeshEntities_Scene_FinalizeRenderEntity(void);
 void CL_UpdateEntityShading(void);
 
 void CL_NewFrameReceived(int num);
@@ -2062,7 +2032,7 @@ void CL_Beam_AddPolygons(const beam_t *b);
 void Sbar_ShowFPS(void);
 void Sbar_ShowFPS_Update(void);
 void Host_SaveConfig(void);
-void Host_LoadConfig_f(void);
+void Host_LoadConfig_f(cmd_state_t *cmd);
 void CL_UpdateMoveVars(void);
 void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
 void V_DriftPitch(void);
@@ -2070,7 +2040,7 @@ void V_FadeViewFlashs(void);
 void V_CalcViewBlend(void);
 void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewangles, qboolean teleported, qboolean clonground, qboolean clcmdjump, float clstatsviewheight, qboolean cldead, qboolean clintermission, const vec3_t clvelocity);
 void V_CalcRefdef(void);
-void CL_Locs_Reload_f(void);
+void CL_Locs_Reload_f(cmd_state_t *cmd);
 
 #endif