X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=414674e5498a90a735d9115c1bf7e6c5ef90c880;hb=86bcb3cfe5cf9df1a7e49fab8bb71e5bb995fdfb;hp=cbc0fc02c1b3333bc16ce2881f452f8667016569;hpb=35a210359bf175b1798c62e196116a19b7181006;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index cbc0fc02..414674e5 100644 --- a/client.h +++ b/client.h @@ -80,9 +80,6 @@ typedef enum r_stat_e r_stat_bufferdatasize_index16, r_stat_bufferdatasize_index32, r_stat_bufferdatasize_uniform, - r_stat_animcache_vertexmesh_count, - r_stat_animcache_vertexmesh_vertices, - r_stat_animcache_vertexmesh_maxvertices, r_stat_animcache_skeletal_count, r_stat_animcache_skeletal_bones, r_stat_animcache_skeletal_maxbones, @@ -161,10 +158,6 @@ typedef enum r_stat_e r_stat_batch_dynamic_surfaces_because_tcmod_turbulent, r_stat_batch_dynamic_vertices_because_tcmod_turbulent, r_stat_batch_dynamic_triangles_because_tcmod_turbulent, - r_stat_batch_dynamic_batches_because_interleavedarrays, - r_stat_batch_dynamic_surfaces_because_interleavedarrays, - r_stat_batch_dynamic_vertices_because_interleavedarrays, - r_stat_batch_dynamic_triangles_because_interleavedarrays, r_stat_batch_dynamic_batches_because_nogaps, r_stat_batch_dynamic_surfaces_because_nogaps, r_stat_batch_dynamic_vertices_because_nogaps, @@ -271,8 +264,6 @@ rtlight_particle_t; typedef struct rtlight_s { - // shadow volumes are done entirely in model space, so there are no matrices for dealing with them... they just use the origin - // note that the world to light matrices are inversely scaled (divided) by lightradius // core properties @@ -304,7 +295,7 @@ typedef struct rtlight_s int flags; // generated properties - /// used only for shadow volumes + /// used only for casting shadows vec3_t shadoworigin; /// culling vec3_t cullmins; @@ -360,9 +351,7 @@ typedef struct rtlight_s int shadowmapatlasposition[2]; /// size of one side of this light in the shadowmap atlas (for omnidirectional shadowmaps this is the min corner of a 2x3 arrangement, or a 4x3 arrangement in the case of noselfshadow entities being present) int shadowmapatlassidesize; - /// premade shadow volumes to render for world entity - shadowmesh_t *static_meshchain_shadow_zpass; - shadowmesh_t *static_meshchain_shadow_zfail; + /// optimized and culled mesh to render for world entity shadows shadowmesh_t *static_meshchain_shadow_shadowmap; /// used for visibility testing (more exact than bbox) int static_numleafs; @@ -488,7 +477,7 @@ typedef struct frameblend_s } frameblend_t; -// LordHavoc: this struct is intended for the renderer but some fields are +// LadyHavoc: this struct is intended for the renderer but some fields are // used by the client. // // The renderer should not rely on any changes to this struct to be persistent @@ -562,10 +551,6 @@ typedef struct entity_render_s float *animcache_tvector3f; r_meshbuffer_t *animcache_tvector3f_vertexbuffer; int animcache_tvector3f_bufferoffset; - // interleaved arrays for rendering and dynamic vertex buffers for them - r_vertexmesh_t *animcache_vertexmesh; - r_meshbuffer_t *animcache_vertexmesh_vertexbuffer; - int animcache_vertexmesh_bufferoffset; // gpu-skinning shader needs transforms in a certain format, we have to // upload this to a uniform buffer for the shader to use, and also keep a // backup copy in system memory for the dynamic batch fallback code @@ -851,7 +836,7 @@ typedef struct client_static_s // -1 = use normal cd track int forcetrack; qfile_t *demofile; - // realtime at second frame of timedemo (LordHavoc: changed to double) + // realtime at second frame of timedemo (LadyHavoc: changed to double) double td_starttime; int td_frames; // total frames parsed double td_onesecondnexttime; @@ -861,7 +846,7 @@ typedef struct client_static_s double td_onesecondmaxfps; double td_onesecondavgfps; int td_onesecondavgcount; - // LordHavoc: pausedemo + // LadyHavoc: pausedemo qboolean demopaused; // sound mixer statistics for showsound display @@ -1001,29 +986,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) @@ -1340,7 +1302,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; @@ -1353,7 +1314,6 @@ typedef struct client_state_s lightstyle_t *lightstyle; int *brushmodel_entities; particle_t *particles; - decal_t *decals; showlmp_t *showlmps; int num_entities; @@ -1575,7 +1535,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); @@ -1639,10 +1599,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 @@ -1659,7 +1619,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); @@ -1815,6 +1775,12 @@ typedef struct r_refdef_view_s vec3_t frustumcorner[4]; // if turned off it renders an ortho view int useperspective; + // allows visibility culling based on the view origin (e.g. pvs and R_CanSeeBox) + // this is turned off by: + // r_trippy + // !r_refdef.view.useperspective + // (sometimes) r_refdef.view.useclipplane + int usevieworiginculling; float ortho_x, ortho_y; // screen area to render in @@ -1993,8 +1959,6 @@ typedef struct r_refdef_s // whether to draw world lights realtime, dlights realtime, and their shadows float polygonfactor; float polygonoffset; - float shadowpolygonfactor; - float shadowpolygonoffset; // how long R_RenderView took on the previous frame double lastdrawscreentime; @@ -2073,7 +2037,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); @@ -2081,7 +2045,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