X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=9c06485f2fefafca4032ae337f6f8d2ee35b3c84;hb=4cadf0af49c8266d57171fa0fe7415f388d8a462;hp=70c2b66a8d0c88c2a64b7019806b74d0a1eb55fa;hpb=5ab33ac35e712417cbc151d01abc808c2de3e435;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index 70c2b66a..9c06485f 100644 --- a/client.h +++ b/client.h @@ -31,6 +31,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // max lights shining on one entity #define MAXENTLIGHTS 128 +// flags for rtlight rendering +#define LIGHTFLAG_NORMALMODE 1 +#define LIGHTFLAG_REALTIMEMODE 2 + extern int cl_max_entities; extern int cl_max_static_entities; extern int cl_max_temp_entities; @@ -72,31 +76,36 @@ beam_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 + // 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 // matrix for transforming world coordinates to light filter coordinates matrix4x4_t matrix_worldtolight; - // based on worldtolight this transforms -1 to +1 to 0 to 1 for purposes - // of attenuation texturing in full 3D (Z result often ignored) - matrix4x4_t matrix_worldtoattenuationxyz; - // this transforms only the Z to S, and T is always 0.5 - matrix4x4_t matrix_worldtoattenuationz; // typically 1 1 1, can be lower (dim) or higher (overbright) vec3_t color; // size of the light (remove?) vec_t radius; // light filter char cubemapname[64]; + // light style to monitor for brightness + int style; // whether light should render shadows int shadow; // intensity of corona to render vec_t corona; - // light style to monitor for brightness - int style; - + // radius scale of corona to render (1.0 means same as light radius) + vec_t coronasizescale; + // ambient intensity to render + vec_t ambientscale; + // diffuse intensity to render + vec_t diffusescale; + // specular intensity to render + vec_t specularscale; + // LIGHTFLAG_* flags + int flags; + // generated properties // used only for shadow volumes vec3_t shadoworigin; @@ -127,10 +136,13 @@ typedef struct rtlight_s shadowmesh_t *static_meshchain_shadow; shadowmesh_t *static_meshchain_light; // used for visibility testing (more exact than bbox) - int static_numclusters; - int static_numclusterpvsbytes; - int *static_clusterlist; - qbyte *static_clusterpvs; + int static_numleafs; + int static_numleafpvsbytes; + int *static_leaflist; + qbyte *static_leafpvs; + // surfaces seen by light + int static_numsurfaces; + int *static_surfacelist; } rtlight_t; @@ -180,11 +192,26 @@ typedef struct dlight_s // corona intensity // (worldlight: saved to .rtlights file) vec_t corona; + // radius scale of corona to render (1.0 means same as light radius) + // (worldlight: saved to .rtlights file) + vec_t coronasizescale; + // ambient intensity to render + // (worldlight: saved to .rtlights file) + vec_t ambientscale; + // diffuse intensity to render + // (worldlight: saved to .rtlights file) + vec_t diffusescale; + // specular intensity to render + // (worldlight: saved to .rtlights file) + vec_t specularscale; + // LIGHTFLAG_* flags + // (worldlight: saved to .rtlights file) + int flags; // linked list of world lights // (worldlight only) struct dlight_s *next; // embedded rtlight struct for renderer - // (renderer only) + // (renderer only) rtlight_t rtlight; } dlight_t; @@ -226,6 +253,9 @@ typedef struct entity_render_s // render flags int flags; + // colormod tinting of models + float colormod[3]; + // interpolated animation // frame that the model is interpolating from @@ -308,6 +338,20 @@ typedef struct float forwardmove; float sidemove; float upmove; + + vec3_t cursor_screen; + vec3_t cursor_start; + vec3_t cursor_end; + vec3_t cursor_impact; + vec3_t cursor_normal; + vec_t cursor_fraction; + int cursor_entitynumber; + + double time; + double receivetime; + int buttons; + int impulse; + int sequence; } usercmd_t; typedef struct @@ -406,11 +450,24 @@ typedef struct netconn_t *netcon; // writing buffer to send to server sizebuf_t message; + qbyte message_buf[1024]; } client_static_t; extern client_static_t cls; +typedef struct client_movementqueue_s +{ + double time; + float frametime; + int sequence; + float viewangles[3]; + float move[3]; + qboolean jump; + qboolean crouch; +} +client_movementqueue_t; + // // the client_state_t structure is wiped completely at every // server signon @@ -427,16 +484,18 @@ typedef struct // send a clc_nop periodically until connected float sendnoptime; - // last command sent to the server + // current input to send to the server usercmd_t cmd; // information for local display // health, etc int stats[MAX_CL_STATS]; - // inventory bit flags - int items; + // last known inventory bit flags, for blinking + int olditems; // cl.time of acquiring item, for blinking float item_gettime[32]; + // last known STAT_ACTIVEWEAPON + int activeweapon; // cl.time of changing STAT_ACTIVEWEAPON float weapontime; // use pain anim frame if cl.time < this @@ -452,20 +511,32 @@ typedef struct // the view is temporarily offset, and an angle reset commands at the start // of each level and after teleporting. - // during demo playback viewangles is lerped between these - vec3_t mviewangles[2]; - // either client controlled, or lerped from demo mviewangles - vec3_t viewangles; - + // mviewangles is read from demo + // viewangles is either client controlled or lerped from mviewangles + vec3_t mviewangles[2], viewangles; + // update by server, used by qc to do weapon recoil + vec3_t mpunchangle[2], punchangle; + // update by server, can be used by mods to kick view around + vec3_t mpunchvector[2], punchvector; // update by server, used for lean+bob (0 is newest) - vec3_t mvelocity[2]; - // lerped between mvelocity[0] and [1] - vec3_t velocity; - - // temporary offset - vec3_t punchangle; - // LordHavoc: origin view kick - vec3_t punchvector; + vec3_t mvelocity[2], velocity; + // update by server, can be used by mods for zooming + vec_t mviewzoom[2], viewzoom; + + // client movement simulation + // these fields are only updated by CL_ClientMovement (called by CL_SendMove after parsing each network packet) + qboolean movement; + // indicates the queue has been updated and should be replayed + qboolean movement_replay; + // simulated data (this is valid even if cl.movement is false) + vec3_t movement_origin; + vec3_t movement_oldorigin; + vec3_t movement_velocity; + // queue of proposed moves + int movement_numqueue; + client_movementqueue_t movement_queue[64]; + int movesequence; + int servermovesequence; // pitch drifting vars float idealpitch; @@ -474,7 +545,6 @@ typedef struct float driftmove; double laststop; - float viewheight; // local amount for smoothing stepups //float crouch; @@ -483,6 +553,11 @@ typedef struct qboolean onground; qboolean inwater; + // used by bob + qboolean oldonground; + double lastongroundtime; + double hitgroundtime; + // don't change view angle, full screen, etc int intermission; // latched at intermission start @@ -515,6 +590,19 @@ typedef struct // type of game (deathmatch, coop, singleplayer) int gametype; + // models and sounds used by engine code (particularly cl_parse.c) + model_t *model_bolt; + model_t *model_bolt2; + model_t *model_bolt3; + model_t *model_beam; + sfx_t *sfx_wizhit; + sfx_t *sfx_knighthit; + sfx_t *sfx_tink1; + sfx_t *sfx_ric1; + sfx_t *sfx_ric2; + sfx_t *sfx_ric3; + sfx_t *sfx_r_exp3; + // refresh related state // cl_entitites[0].model @@ -531,24 +619,18 @@ typedef struct // [cl.maxclients] scoreboard_t *scores; - // LordHavoc: sniping zoom, QC controlled - float viewzoom; - // for interpolation - float viewzoomold, viewzoomnew; - // protocol version of the server we're connected to - int protocol; + protocolversion_t protocol; // entity database stuff - // latest received entity frame number - int latestframenum; + // latest received entity frame numbers +#define LATESTFRAMENUMS 3 + int latestframenums[LATESTFRAMENUMS]; entityframe_database_t *entitydatabase; entityframe4_database_t *entitydatabase4; } client_state_t; -extern mempool_t *cl_scores_mempool; - // // cvars // @@ -556,6 +638,8 @@ extern cvar_t cl_name; extern cvar_t cl_color; extern cvar_t cl_rate; extern cvar_t cl_pmodel; +extern cvar_t cl_playermodel; +extern cvar_t cl_playerskin; extern cvar_t cl_upspeed; extern cvar_t cl_forwardspeed; @@ -594,7 +678,14 @@ extern cvar_t cl_explosions_size_start; extern cvar_t cl_explosions_size_end; extern cvar_t cl_explosions_lifetime; extern cvar_t cl_stainmaps; -extern cvar_t cl_stainmapsclearonload; +extern cvar_t cl_stainmaps_clearonload; + +extern cvar_t cl_prydoncursor; + +extern vec3_t cl_playerstandmins; +extern vec3_t cl_playerstandmaxs; +extern vec3_t cl_playercrouchmins; +extern vec3_t cl_playercrouchmaxs; // these are updated by CL_ClearState extern int cl_num_entities; @@ -602,12 +693,12 @@ extern int cl_num_static_entities; extern int cl_num_temp_entities; extern int cl_num_brushmodel_entities; -extern mempool_t *cl_entities_mempool; +extern mempool_t *cl_mempool; extern entity_t *cl_entities; extern qbyte *cl_entities_active; extern entity_t *cl_static_entities; extern entity_t *cl_temp_entities; -extern entity_render_t **cl_brushmodel_entities; +extern int *cl_brushmodel_entities; extern cl_effect_t *cl_effects; extern beam_t *cl_beams; extern dlight_t *cl_dlights; @@ -616,7 +707,7 @@ extern lightstyle_t *cl_lightstyle; extern client_state_t cl; -extern void CL_AllocDlight (entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, int cubemapnum, int style, int shadowenable, vec_t corona); +extern void CL_AllocDlight (entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, int cubemapnum, int style, int shadowenable, vec_t corona, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags); extern void CL_DecayLights (void); //============================================================================= @@ -625,6 +716,7 @@ extern void CL_DecayLights (void); // cl_main // +void CL_Shutdown (void); void CL_Init (void); void CL_EstablishConnection(const char *host); @@ -653,8 +745,8 @@ extern kbutton_t in_strafe; extern kbutton_t in_speed; void CL_InitInput (void); -void CL_SendCmd (usercmd_t *cmd); -void CL_SendMove (usercmd_t *cmd); +void CL_SendCmd (void); +void CL_SendMove (void); void CL_ValidateState(entity_state_t *s); void CL_MoveLerpEntityStates(entity_t *ent); @@ -668,15 +760,18 @@ entity_t *CL_NewTempEntity (void); void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate); void CL_ClearState (void); +void CL_ExpandEntities(int num); int CL_ReadFromServer (void); -void CL_WriteToServer (usercmd_t *cmd); -void CL_BaseMove (usercmd_t *cmd); +void CL_WriteToServer (void); +void CL_Move (void); +extern qboolean cl_ignoremousemove; float CL_KeyState (kbutton_t *key); const char *Key_KeynumToString (int keynum); +int Key_StringToKeynum (const char *str); // // cl_demo.c @@ -695,6 +790,7 @@ void CL_TimeDemo_f(void); // cl_parse.c // void CL_Parse_Init(void); +void CL_Parse_Shutdown(void); void CL_ParseServerMessage(void); void CL_Parse_DumpPacket(void); @@ -709,12 +805,6 @@ float V_CalcRoll (vec3_t angles, vec3_t velocity); void V_UpdateBlends (void); void V_ParseDamage (void); - -// -// cl_tent -// -void CL_InitTEnts (void); - // // cl_part // @@ -742,6 +832,7 @@ extern cvar_t cl_decals_fadetime; void CL_Particles_Clear(void); void CL_Particles_Init(void); +void CL_Particles_Shutdown(void); void CL_ParseParticleEffect (void); void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count); @@ -791,10 +882,25 @@ typedef struct // fullscreen color blend float viewblend[4]; + // whether to call S_ExtraUpdate during render to reduce sound chop + qboolean extraupdate; + + // client gameworld time for rendering time based effects + double time; + + // the world + entity_render_t *worldentity; + + // same as worldentity->model + model_t *worldmodel; + + // renderable entities (excluding world) entity_render_t **entities; int numentities; int maxentities; + // 2D art drawing queue + // TODO: get rid of this qbyte *drawqueue; int drawqueuesize; int maxdrawqueuesize; @@ -803,8 +909,6 @@ refdef_t; refdef_t r_refdef; -extern mempool_t *cl_refdef_mempool; - #include "cgamevm.h" #endif