X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=c50db411eb7269a06cc6dbddd35c227f5720a988;hb=d7fd66581c5ea2bdb6c6f589fb02c0c40ee6974b;hp=f634a223c81c292031df08293c84db613997b1be;hpb=ac947d2fbb445473c266390a1fca26c8be8611c4;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index f634a223..c50db411 100644 --- a/client.h +++ b/client.h @@ -76,18 +76,13 @@ 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?) @@ -110,7 +105,7 @@ typedef struct rtlight_s vec_t specularscale; // LIGHTFLAG_* flags int flags; - + // generated properties // used only for shadow volumes vec3_t shadoworigin; @@ -137,14 +132,16 @@ typedef struct rtlight_s int isstatic; // true if this is a compiled world light, cleared if the light changes int compiled; - // premade shadow volumes and lit surfaces to render for world entity + // premade shadow volumes to render for world entity 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; @@ -213,7 +210,7 @@ typedef struct dlight_s // (worldlight only) struct dlight_s *next; // embedded rtlight struct for renderer - // (renderer only) + // (renderer only) rtlight_t rtlight; } dlight_t; @@ -348,6 +345,12 @@ typedef struct 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 @@ -446,11 +449,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 @@ -494,20 +510,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; @@ -524,6 +552,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 @@ -556,6 +589,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 @@ -572,13 +618,8 @@ 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 numbers @@ -589,8 +630,6 @@ typedef struct } client_state_t; -extern mempool_t *cl_scores_mempool; - // // cvars // @@ -642,18 +681,23 @@ 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; 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; @@ -715,11 +759,13 @@ 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 (void); -void CL_BaseMove (void); +void CL_Move (void); +extern qboolean cl_ignoremousemove; float CL_KeyState (kbutton_t *key); @@ -758,12 +804,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 // @@ -868,8 +908,6 @@ refdef_t; refdef_t r_refdef; -extern mempool_t *cl_refdef_mempool; - #include "cgamevm.h" #endif