X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=client.h;h=e30360b74b31473a1c6f1b6d5518fb21f38b6f67;hb=631460dc33a02b110ac3b44227afbb4d19cd969d;hp=01d443301dc1563a7aa43f22fe80a03ac4ca4f5e;hpb=c205fc63e780877ef0b6b3cfe747e2f9e8228c40;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 01d44330..e30360b7 100644
--- a/client.h
+++ b/client.h
@@ -69,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)
@@ -126,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;
 
@@ -150,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
@@ -201,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;
@@ -232,8 +243,8 @@ typedef struct entity_render_s
 
 	// NULL = no model
 	model_t *model;
-	// current uninterpolated animation frame (for things which do not use interpolation)
-	int frame;
+	// number of the entity represents, or 0 for non-network entities
+	int entitynumber;
 	// entity shirt and pants colors (-1 if not colormapped)
 	int colormap;
 	// literal colors for renderer
@@ -241,6 +252,8 @@ typedef struct entity_render_s
 	vec3_t colormap_shirtcolor;
 	// light, particles, etc
 	int effects;
+	// qw CTF flags and other internal-use-only effect bits
+	int internaleffects;
 	// for Alias models
 	int skinnum;
 	// render flags
@@ -273,6 +286,9 @@ 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;
 
@@ -282,6 +298,7 @@ typedef struct entity_persistent_s
 
 	// particle trail
 	float trail_time;
+	qboolean trail_allowed; // set to false by teleports, true by update code, prevents bad lerps
 
 	// muzzleflash fading
 	float muzzleflash;
@@ -341,6 +358,7 @@ typedef struct usercmd_s
 	int impulse;
 	int sequence;
 	qboolean applied; // if false we're still accumulating a move
+	qboolean predicted; // if true the sequence should be sent as 0
 } usercmd_t;
 
 typedef struct lightstyle_s
@@ -419,6 +437,7 @@ typedef struct capturevideostate_s
 	double starttime;
 	double framerate;
 	// for AVI saving some values have to be written after capture ends
+	fs_offset_t videofile_firstchunkframes_offset;
 	fs_offset_t videofile_totalframes_offset1;
 	fs_offset_t videofile_totalframes_offset2;
 	fs_offset_t videofile_totalsampleframes_offset;
@@ -430,7 +449,8 @@ typedef struct capturevideostate_s
 	int soundrate;
 	int frame;
 	int soundsampleframe; // for AVI saving
-	unsigned char *buffer;
+	unsigned char *screenbuffer;
+	unsigned char *outbuffer;
 	sizebuf_t riffbuffer;
 	unsigned char riffbufferdata[128];
 	// note: riffindex buffer has an allocated ->data member, not static like most!
@@ -440,6 +460,7 @@ typedef struct capturevideostate_s
 	short rgbtoyuvscaletable[3][3][256];
 	unsigned char yuvnormalizetable[3][256];
 	char basename[64];
+	int width, height;
 }
 capturevideostate_t;
 
@@ -513,6 +534,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
@@ -560,6 +585,7 @@ typedef struct client_movementqueue_s
 	float move[3];
 	qboolean jump;
 	qboolean crouch;
+	qboolean canjump;
 }
 client_movementqueue_t;
 
@@ -622,6 +648,9 @@ typedef struct particle_s
 	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		relativedirection; // decal oriented this way relative to entity's coordinate space
+	float		delayedcollisions; // time that p->bounce becomes active
+	float		delayedspawn; // time that particle appears and begins moving
+	float		die; // time when this particle should be removed, regardless of alpha
 }
 particle_t;
 
@@ -635,6 +664,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
@@ -655,6 +692,7 @@ typedef struct client_state_s
 // information for local display
 	// health, etc
 	int stats[MAX_CL_STATS];
+	float *statsf; // points to stats[] array
 	// last known inventory bit flags, for blinking
 	int olditems;
 	// cl.time of acquiring item, for blinking
@@ -666,7 +704,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];
@@ -700,6 +739,8 @@ 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;
@@ -712,8 +753,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;
 
@@ -751,15 +790,11 @@ typedef struct client_state_s
 	// the timestamp of the last two messages
 	double mtime[2];
 
-	// similar to cl.time but this can go past cl.mtime[0] when packets are
-	// not being received, it is still clamped to the cl.mtime[1] to
-	// cl.mtime[0] range whenever a packet is received, it just does not stop
-	// when interpolation finishes
-	double timenonlerp;
-
 	// 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)
@@ -782,6 +817,11 @@ typedef struct client_state_s
 	int viewentity;
 	// the real player entity (normally same as viewentity,
 	// different than viewentity if mod uses chasecam or other tricks)
+	int realplayerentity;
+	// this is updated to match cl.viewentity whenever it is in the clients
+	// range, basically this is used in preference to cl.realplayerentity for
+	// most purposes because when spectating another player it should show
+	// their information rather than yours
 	int playerentity;
 	// max players that can be in this game
 	int maxclients;
@@ -800,6 +840,8 @@ typedef struct client_state_s
 	sfx_t *sfx_ric2;
 	sfx_t *sfx_ric3;
 	sfx_t *sfx_r_exp3;
+	// indicates that the file "sound/misc/talk2.wav" was found (for use by team chat messages)
+	qboolean foundtalk2wav;
 
 // refresh related state
 
@@ -885,6 +927,8 @@ typedef struct client_state_s
 	int downloadsound_current;
 	int loadsound_total;
 	qboolean downloadcsqc;
+	qboolean loadcsqc;
+	qboolean loadbegun;
 	qboolean loadfinished;
 
 	// quakeworld stuff
@@ -902,20 +946,29 @@ typedef struct client_state_s
 	int qw_teamplay;
 
 	// unused: indicates whether the player is spectating
-	// use cl.scores[cl.playerentity].qw_spectator instead
+	// use cl.scores[cl.playerentity-1].qw_spectator instead
 	//qboolean qw_spectator;
 
 	// movement parameters for client prediction
-	float qw_movevars_gravity;
-	float qw_movevars_stopspeed;
-	float qw_movevars_maxspeed; // can change during play
-	float qw_movevars_spectatormaxspeed;
-	float qw_movevars_accelerate;
-	float qw_movevars_airaccelerate;
-	float qw_movevars_wateraccelerate;
-	float qw_movevars_friction;
-	float qw_movevars_waterfriction;
-	float qw_movevars_entgravity; // can change during play
+	float movevars_wallfriction;
+	float movevars_waterfriction;
+	float movevars_friction;
+	float movevars_ticrate;
+	float movevars_timescale;
+	float movevars_gravity;
+	float movevars_stopspeed;
+	float movevars_maxspeed;
+	float movevars_spectatormaxspeed;
+	float movevars_accelerate;
+	float movevars_airaccelerate;
+	float movevars_wateraccelerate;
+	float movevars_entgravity;
+	float movevars_jumpvelocity;
+	float movevars_edgefriction;
+	float movevars_maxairspeed;
+	float movevars_stepheight;
+	float movevars_airaccel_qw;
+	float movevars_airaccel_sideways_friction;
 
 	// models used by qw protocol
 	int qw_modelindex_spike;
@@ -935,6 +988,30 @@ typedef struct client_state_s
 	int qw_validsequence;
 
 	int qw_deltasequence[QW_UPDATE_BACKUP];
+
+	// csqc stuff:
+	// server entity number corresponding to a clientside entity
+	unsigned short csqc_server2csqcentitynumber[MAX_EDICTS];
+	qboolean csqc_loaded;
+	vec3_t csqc_origin;
+	vec3_t csqc_angles;
+	qboolean csqc_usecsqclistener;
+	matrix4x4_t csqc_listenermatrix;
+	char csqc_printtextbuf[MAX_INPUTLINE];
+
+	// 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;
+
+	// processing buffer used by R_BuildLightMap, reallocated as needed,
+	// freed on each level change
+	size_t buildlightmapmemorysize;
+	unsigned char *buildlightmapmemory;
 }
 client_state_t;
 
@@ -967,6 +1044,9 @@ extern cvar_t cl_autofire;
 
 extern cvar_t cl_shownet;
 extern cvar_t cl_nolerp;
+extern cvar_t cl_nettimesyncfactor;
+extern cvar_t cl_nettimesyncboundmode;
+extern cvar_t cl_nettimesyncboundtolerance;
 
 extern cvar_t cl_pitchdriftspeed;
 extern cvar_t lookspring;
@@ -995,9 +1075,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);
 
 //=============================================================================
 
@@ -1014,7 +1099,7 @@ void CL_Disconnect (void);
 void CL_Disconnect_f (void);
 
 void CL_UpdateRenderEntity(entity_render_t *ent);
-void CL_UpdateEntities(void);
+void CL_UpdateViewEntities(void);
 
 //
 // cl_input
@@ -1040,6 +1125,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);
@@ -1051,9 +1137,9 @@ void CL_ExpandEntities(int num);
 void CL_SetInfo(const char *key, const char *value, qboolean send, qboolean allowstarkey, qboolean allowmodel, qboolean quiet);
 
 
-int  CL_ReadFromServer (void);
+void CL_UpdateWorld (void);
 void CL_WriteToServer (void);
-void CL_Move (void);
+void CL_Input (void);
 extern qboolean cl_ignoremousemove;
 
 
@@ -1066,7 +1152,7 @@ int Key_StringToKeynum (const char *str);
 //
 void CL_StopPlayback(void);
 void CL_ReadDemoMessage(void);
-void CL_WriteDemoMessage(void);
+void CL_WriteDemoMessage(sizebuf_t *mesage);
 
 void CL_NextDemo(void);
 void CL_Stop_f(void);
@@ -1108,10 +1194,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;
@@ -1170,6 +1257,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,9 +1279,8 @@ extern qboolean sb_showscores;
 #define NUMCROSSHAIRS 32
 extern cachepic_t *r_crosshairs[NUMCROSSHAIRS+1];
 
-#define FOGTABLEWIDTH 1024
-extern int fogtableindex;
-#define VERTEXFOGTABLE(dist) (fogtableindex = (int)((dist) * r_refdef.fogtabledistmultiplier), r_refdef.fogtable[bound(0, fogtableindex, FOGTABLEWIDTH - 1)])
+float FogPoint_World(const vec3_t p);
+float FogPoint_Model(const vec3_t p);
 
 typedef struct r_refdef_stats_s
 {
@@ -1254,7 +1341,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
@@ -1264,8 +1351,9 @@ typedef struct r_refdef_s
 	vec3_t fogcolor;
 	vec_t fogrange;
 	vec_t fograngerecip;
-	vec_t fogtabledistmultiplier;
-	float fogtable[FOGTABLEWIDTH];
+	vec_t fogmasktabledistmultiplier;
+#define FOGMASKTABLEWIDTH 1024
+	float fogmasktable[FOGMASKTABLEWIDTH];
 	float fog_density;
 	float fog_red;
 	float fog_green;
@@ -1317,6 +1405,10 @@ typedef struct r_view_s
 	vec3_t up;
 	mplane_t frustum[5];
 	float frustum_x, frustum_y;
+	vec3_t frustumcorner[4];
+	// if turned off it renders an ortho view
+	int useperspective;
+	float ortho_x, ortho_y;
 
 	// screen area to render in
 	int x;