X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=aa323fcd9520cdeba82d24158909bc2ac43d14e4;hb=938076b14d524fa61920c6538115c2829baa2693;hp=f634a223c81c292031df08293c84db613997b1be;hpb=ac947d2fbb445473c266390a1fca26c8be8611c4;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index f634a223..aa323fcd 100644 --- a/client.h +++ b/client.h @@ -57,7 +57,7 @@ typedef struct effect_s } cl_effect_t; -typedef struct +typedef struct beam_s { int entity; // draw this as lightning polygons, or a model? @@ -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; @@ -122,6 +117,12 @@ typedef struct rtlight_s // squared cullradius //vec_t cullradius2; + // rendering properties, updated each time a light is rendered + // this is rtlight->color * d_lightstylevalue + vec3_t currentcolor; + // this is R_Shadow_Cubemap(rtlight->cubemapname) + rtexture_t *currentcubemap; + // lightmap renderer stuff (remove someday!) // the size of the light vec_t lightmap_cullradius; @@ -137,14 +138,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; + unsigned char *static_leafpvs; + // surfaces seen by light + int static_numsurfaces; + int *static_surfacelist; } rtlight_t; @@ -213,7 +216,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; @@ -246,8 +249,11 @@ typedef struct entity_render_s model_t *model; // current uninterpolated animation frame (for things which do not use interpolation) int frame; - // entity shirt and pants colors + // entity shirt and pants colors (-1 if not colormapped) int colormap; + // literal colors for renderer + vec3_t colormap_pantscolor; + vec3_t colormap_shirtcolor; // light, particles, etc int effects; // for Alias models @@ -317,6 +323,7 @@ entity_persistent_t; typedef struct entity_s { + qboolean csqc; // baseline state (default values) entity_state_t state_baseline; // previous state (interpolating from this) @@ -332,7 +339,7 @@ typedef struct entity_s } entity_t; -typedef struct +typedef struct usercmd_s { vec3_t viewangles; @@ -348,22 +355,28 @@ 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 +typedef struct lightstyle_s { int length; char map[MAX_STYLESTRING]; } lightstyle_t; -typedef struct +typedef struct scoreboard_s { char name[MAX_SCOREBOARDNAME]; int frags; int colors; // two 4 bit fields } scoreboard_t; -typedef struct +typedef struct cshift_s { int destcolor[3]; int percent; // 0-256 @@ -400,7 +413,7 @@ cactive_t; // the client_static_t structure is persistent through an arbitrary number // of server connections // -typedef struct +typedef struct client_static_s { cactive_t state; @@ -446,16 +459,37 @@ typedef struct netconn_t *netcon; // writing buffer to send to server sizebuf_t message; + unsigned char 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; + +//[515]: csqc +typedef struct +{ + qboolean drawworld; + qboolean drawenginesbar; + qboolean drawcrosshair; +}csqc_vidvars_t; + // // the client_state_t structure is wiped completely at every // server signon // -typedef struct +typedef struct client_state_s { // true if playing in a local game and no one else is connected int islocalgame; @@ -494,20 +528,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; @@ -516,6 +562,12 @@ typedef struct float driftmove; double laststop; +//[515]: added for csqc purposes + float sensitivityscale; + csqc_vidvars_t csqc_vidvars; //[515]: these parms must be set to true by default + qboolean csqc_wantsmousemove; + struct model_s *csqc_model_precache[MAX_MODELS]; + // local amount for smoothing stepups //float crouch; @@ -524,6 +576,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 +613,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 +642,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 +654,6 @@ typedef struct } client_state_t; -extern mempool_t *cl_scores_mempool; - // // cvars // @@ -615,6 +678,9 @@ extern cvar_t cl_anglespeedkey; extern cvar_t cl_autofire; +extern cvar_t csqc_progname; //[515]: csqc crc check and right csprogs name according to progs.dat +extern cvar_t csqc_progcrc; + extern cvar_t cl_shownet; extern cvar_t cl_nolerp; @@ -642,18 +708,26 @@ 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_csqcentities; 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_csqcentities; +extern unsigned char *cl_entities_active; +extern unsigned char *cl_csqcentities_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; @@ -663,7 +737,6 @@ 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, vec_t coronasizescale, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int flags); -extern void CL_DecayLights (void); //============================================================================= @@ -688,7 +761,7 @@ extern cvar_t cl_beams_lightatend; // // cl_input // -typedef struct +typedef struct kbutton_s { int down[2]; // key nums holding it down int state; // low bit is down state @@ -715,11 +788,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 +833,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 // @@ -771,6 +840,7 @@ void CL_InitTEnts (void); extern cvar_t cl_particles; extern cvar_t cl_particles_quality; extern cvar_t cl_particles_size; +extern cvar_t cl_particles_quake; extern cvar_t cl_particles_bloodshowers; extern cvar_t cl_particles_blood; extern cvar_t cl_particles_blood_alpha; @@ -822,15 +892,15 @@ void R_NewExplosion(vec3_t org); #include "cl_screen.h" -typedef struct +typedef struct refdef_s { // area to render in int x, y, width, height; - float fov_x, fov_y; + float frustum_x, frustum_y; // these are set for water warping before - // fov_x/fov_y are calculated - float fovscale_x, fovscale_y; + // frustum_x/frustum_y are calculated + float frustumscale_x, frustumscale_y; // view transform matrix4x4_t viewentitymatrix; @@ -858,17 +928,23 @@ typedef struct int numentities; int maxentities; + // renderable dynamic lights + dlight_t *lights[MAX_DLIGHTS]; + int numlights; + + // 8.8bit fixed point intensities for light styles + // controls intensity of dynamic lights and lightmap layers + unsigned short lightstylevalue[256]; // 8.8 fraction of base light value + // 2D art drawing queue // TODO: get rid of this - qbyte *drawqueue; + unsigned char *drawqueue; int drawqueuesize; int maxdrawqueuesize; } refdef_t; -refdef_t r_refdef; - -extern mempool_t *cl_refdef_mempool; +extern refdef_t r_refdef; #include "cgamevm.h"