X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=fea8d0486c510f004c115b54db3d4365547ed050;hb=0e2bba8afcaafbb7e196b37988f0c54ce4a0bcaa;hp=df05ea43df18387ea5a081bf68796e19cebce478;hpb=8b37a3a674013f693250d761388cbf39265a0d42;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index df05ea43..fea8d048 100644 --- a/client.h +++ b/client.h @@ -27,6 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // LordHavoc: 256 dynamic lights #define MAX_DLIGHTS 256 +// this is the maximum number of input packets that can be lost without a +// misprediction +#define CL_MAX_USERCMDS 16 + // flags for rtlight rendering #define LIGHTFLAG_NORMALMODE 1 #define LIGHTFLAG_REALTIMEMODE 2 @@ -65,6 +69,8 @@ typedef struct rtlight_s // note that the world to light matrices are inversely scaled (divided) by lightradius // core properties + // matrix for transforming light filter coordinates to world coordinates + matrix4x4_t matrix_lighttoworld; // matrix for transforming world coordinates to light filter coordinates matrix4x4_t matrix_worldtolight; // typically 1 1 1, can be lower (dim) or higher (overbright) @@ -122,6 +128,19 @@ typedef struct rtlight_s // surfaces seen by light int static_numsurfaces; int *static_surfacelist; + // flag bits indicating which triangles of the world model should cast + // shadows, and which ones should be lit + // + // this avoids redundantly scanning the triangles in each surface twice + // for whether they should cast shadows, once in culling and once in the + // actual shadowmarklist production. + int static_numshadowtrispvsbytes; + unsigned char *static_shadowtrispvs; + // this allows the lighting batch code to skip backfaces andother culled + // triangles not relevant for lighting + // (important on big surfaces such as terrain) + int static_numlighttrispvsbytes; + unsigned char *static_lighttrispvs; } rtlight_t; @@ -146,11 +165,7 @@ typedef struct dlight_s // color of light // (worldlight: saved to .rtlights file) vec3_t color; - // cubemap number to use on this light - // (dlight only) - int cubemapnum; // cubemap name to use on this light - // (worldlight only) // (worldlight: saved to .rtlights file) char cubemapname[64]; // make light flash while selected @@ -197,7 +212,7 @@ typedef struct dlight_s // (worldlight only) struct dlight_s *next; // embedded rtlight struct for renderer - // (renderer only) + // (worldlight only) rtlight_t rtlight; } dlight_t; @@ -269,13 +284,14 @@ typedef struct entity_render_s vec3_t modellight_ambient; vec3_t modellight_diffuse; // q3bsp vec3_t modellight_lightdir; // q3bsp + + // last time visible during trace culling + double last_trace_visibility; } entity_render_t; typedef struct entity_persistent_s { - int linkframe; - vec3_t trail_origin; // particle trail @@ -300,7 +316,6 @@ entity_persistent_t; typedef struct entity_s { - qboolean csqc; // baseline state (default values) entity_state_t state_baseline; // previous state (interpolating from this) @@ -335,6 +350,7 @@ typedef struct usercmd_s double time; double receivetime; + int msec; // for qw moves int buttons; int impulse; int sequence; @@ -483,10 +499,12 @@ typedef struct client_static_s int td_startframe; // realtime at second frame of timedemo (LordHavoc: changed to double) double td_starttime; - // LordHavoc: for measuring maxfps - double td_minframetime; - // LordHavoc: for measuring minfps - double td_maxframetime; + double td_onesecondnexttime; + double td_onesecondframes; + double td_onesecondminframes; + double td_onesecondmaxframes; + double td_onesecondavgframes; + int td_onesecondavgcount; // LordHavoc: pausedemo qboolean demopaused; @@ -509,6 +527,10 @@ typedef struct client_static_s // (note: qw_download variables are also used) cl_downloadack_t dp_downloadack[CL_MAX_DOWNLOADACKS]; + // input sequence numbers are not reset on level change, only connect + int movesequence; + int servermovesequence; + // quakeworld stuff below // value of "qport" cvar at time of connection @@ -567,18 +589,6 @@ typedef struct qboolean drawcrosshair; }csqc_vidvars_t; -typedef struct qw_usercmd_s -{ - vec3_t angles; - short forwardmove, sidemove, upmove; - unsigned char padding1[2]; - unsigned char msec; - unsigned char buttons; - unsigned char impulse; - unsigned char padding2; -} -qw_usercmd_t; - typedef enum { PARTICLE_BILLBOARD = 0, @@ -643,6 +653,14 @@ typedef enum cl_parsingtextmode_e } cl_parsingtextmode_t; +typedef struct cl_locnode_s +{ + struct cl_locnode_s *next; + char *name; + vec3_t mins, maxs; +} +cl_locnode_t; + // // the client_state_t structure is wiped completely at every // server signon @@ -652,15 +670,13 @@ typedef struct client_state_s // true if playing in a local game and no one else is connected int islocalgame; - // when connecting to the server throw out the first couple move messages - // so the player doesn't accidentally do something the first frame - int movemessages; - // send a clc_nop periodically until connected float sendnoptime; - // current input to send to the server + // current input being accumulated by mouse/joystick/etc input usercmd_t cmd; + // latest moves sent to the server that have not been confirmed yet + usercmd_t movecmd[CL_MAX_USERCMDS]; // information for local display // health, etc @@ -676,7 +692,8 @@ typedef struct client_state_s // use pain anim frame if cl.time < this float faceanimtime; // for stair smoothing - float stairoffset; + float stairsmoothz; + double stairsmoothtime; // color shifts for damage, powerups cshift_t cshifts[NUM_CSHIFTS]; @@ -710,13 +727,13 @@ typedef struct client_state_s // these fields are only updated by CL_ClientMovement (called by CL_SendMove after parsing each network packet) // set by CL_ClientMovement_Replay functions qboolean movement_predicted; + // if true the CL_ClientMovement_Replay function will update origin, etc + qboolean movement_replay; // this is set true by svc_time parsing and causes a new movement to be // queued for prediction purposes qboolean movement_needupdate; - // indicates the queue has been updated and should be replayed - qboolean movement_replay; // timestamps of latest two predicted moves for interpolation - double movement_time[2]; + double movement_time[4]; // simulated data (this is valid even if cl.movement is false) vec3_t movement_origin; vec3_t movement_oldorigin; @@ -724,8 +741,6 @@ typedef struct client_state_s // queue of proposed moves int movement_numqueue; client_movementqueue_t movement_queue[256]; - int movesequence; - int servermovesequence; // whether the replay should allow a jump at the first sequence qboolean movement_replay_canjump; @@ -766,6 +781,8 @@ typedef struct client_state_s // clients view of time, time should be between mtime[0] and mtime[1] to // generate a lerp point for other data, oldtime is the previous frame's // value of time, frametime is the difference between time and oldtime + // note: cl.time may be beyond cl.mtime[0] if packet loss is occuring, it + // is only forcefully limited when a packet is received double time, oldtime; // how long it has been since the previous client frame in real time // (not game time, for that use cl.time - cl.oldtime) @@ -852,7 +869,6 @@ typedef struct client_state_s vec3_t playercrouchmaxs; int max_entities; - int max_csqcentities; int max_static_entities; int max_temp_entities; int max_effects; @@ -863,9 +879,7 @@ typedef struct client_state_s int max_particles; entity_t *entities; - entity_t *csqcentities; //[515]: csqc unsigned char *entities_active; - unsigned char *csqcentities_active; //[515]: csqc entity_t *static_entities; entity_t *temp_entities; cl_effect_t *effects; @@ -876,7 +890,6 @@ typedef struct client_state_s particle_t *particles; int num_entities; - int num_csqcentities; //[515]: csqc int num_static_entities; int num_temp_entities; int num_brushmodel_entities; @@ -895,6 +908,7 @@ typedef struct client_state_s int downloadsound_current; int loadsound_total; qboolean downloadcsqc; + qboolean loadbegun; qboolean loadfinished; // quakeworld stuff @@ -944,9 +958,18 @@ typedef struct client_state_s int qw_validsequence; - qw_usercmd_t qw_moves[QW_UPDATE_BACKUP]; - int qw_deltasequence[QW_UPDATE_BACKUP]; + + // csqc stuff: + + // collision culling data + world_t world; + + // loc file stuff (points and boxes describing locations in the level) + cl_locnode_t *locnodes; + // this is updated to cl.movement_origin whenever health is < 1 + // used by %d print in say/say_team messages if cl_locs_enable is on + vec3_t lastdeathorigin; } client_state_t; @@ -979,6 +1002,7 @@ extern cvar_t cl_autofire; extern cvar_t cl_shownet; extern cvar_t cl_nolerp; +extern cvar_t cl_nettimesyncmode; extern cvar_t cl_pitchdriftspeed; extern cvar_t lookspring; @@ -1007,9 +1031,14 @@ extern cvar_t cl_stainmaps_clearonload; extern cvar_t cl_prydoncursor; +extern cvar_t cl_locs_enable; + 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_AllocLightFlash (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); + +cl_locnode_t *CL_Locs_FindNearest(const vec3_t point); +void CL_Locs_FindLocationName(char *buffer, size_t buffersize, vec3_t point); //============================================================================= @@ -1026,6 +1055,7 @@ void CL_Disconnect (void); void CL_Disconnect_f (void); void CL_UpdateRenderEntity(entity_render_t *ent); +void CL_UpdateViewEntities(void); // // cl_input @@ -1051,6 +1081,7 @@ void CL_ParseTEnt (void); void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning); void CL_RelinkBeams (void); void CL_Beam_CalculatePositions (const beam_t *b, vec3_t start, vec3_t end); +void CL_ClientMovement_Replay(void); void CL_ClearTempEntities (void); entity_t *CL_NewTempEntity (void); @@ -1064,7 +1095,7 @@ void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allo int CL_ReadFromServer (void); void CL_WriteToServer (void); -void CL_Move (void); +void CL_Input (void); extern qboolean cl_ignoremousemove; @@ -1119,10 +1150,11 @@ extern cvar_t cl_particles_blood; extern cvar_t cl_particles_blood_alpha; extern cvar_t cl_particles_blood_bloodhack; extern cvar_t cl_particles_bulletimpacts; -extern cvar_t cl_particles_explosions_bubbles; extern cvar_t cl_particles_explosions_smoke; extern cvar_t cl_particles_explosions_sparks; extern cvar_t cl_particles_explosions_shell; +extern cvar_t cl_particles_rain; +extern cvar_t cl_particles_snow; extern cvar_t cl_particles_smoke; extern cvar_t cl_particles_smoke_alpha; extern cvar_t cl_particles_smoke_alphafade; @@ -1181,6 +1213,7 @@ effectnameindex_t; int CL_ParticleEffectIndexForName(const char *name); const char *CL_ParticleEffectNameForIndex(int i); void CL_ParticleEffect(int effectindex, float pcount, const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, entity_t *ent, int palettecolor); +void CL_ParticleTrail(int effectindex, float pcount, const vec3_t originmins, const vec3_t originmaxs, const vec3_t velocitymins, const vec3_t velocitymaxs, entity_t *ent, int palettecolor, qboolean spawndlight, qboolean spawnparticles); void CL_ParseParticleEffect (void); void CL_ParticleCube (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, vec_t gravity, vec_t randomvel); void CL_ParticleRain (const vec3_t mins, const vec3_t maxs, const vec3_t dir, int count, int colorbase, int type); @@ -1191,6 +1224,10 @@ void CL_MoveParticles(void); void R_MoveExplosions(void); void R_NewExplosion(const vec3_t org); +void Debug_PolygonBegin(const char *picname, int flags, qboolean draw2d, float linewidth); +void Debug_PolygonVertex(float x, float y, float z, float s, float t, float r, float g, float b, float a); +void Debug_PolygonEnd(void); + #include "cl_screen.h" extern qboolean sb_showscores; @@ -1261,7 +1298,7 @@ typedef struct r_refdef_s int maxentities; // renderable dynamic lights - dlight_t *lights[MAX_DLIGHTS]; + rtlight_t lights[MAX_DLIGHTS]; int numlights; // 8.8bit fixed point intensities for light styles @@ -1324,6 +1361,7 @@ typedef struct r_view_s vec3_t up; mplane_t frustum[5]; float frustum_x, frustum_y; + vec3_t frustumcorner[4]; // screen area to render in int x;