X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=client.h;h=246d425eb4fdb2aa990daeff040c1d88b8b6f34a;hp=053365afee045f0cd0b03cc40af4ea3d5d121d48;hb=a563a5248b0ec2278c6ffd1d7f6d39d4c6b7a15c;hpb=3478423d370b83ed35cc123790ab24a1939a9acd diff --git a/client.h b/client.h index 053365af..246d425e 100644 --- a/client.h +++ b/client.h @@ -26,10 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // LordHavoc: 256 dynamic lights #define MAX_DLIGHTS 256 -// LordHavoc: this affects the lighting scale of the whole game -#define LIGHTOFFSET 1024.0f -// max lights shining on one entity -#define MAXENTLIGHTS 128 // flags for rtlight rendering #define LIGHTFLAG_NORMALMODE 1 @@ -117,16 +113,6 @@ typedef struct rtlight_s // this is R_Shadow_Cubemap(rtlight->cubemapname) rtexture_t *currentcubemap; - // lightmap renderer stuff (remove someday!) - // the size of the light - vec_t lightmap_cullradius; - // the size of the light, squared - vec_t lightmap_cullradius2; - // the brightness of the light - vec3_t lightmap_light; - // to avoid sudden brightness change at cullradius, subtract this - vec_t lightmap_subtract; - // static light info // true if this light should be compiled as a static light int isstatic; @@ -280,12 +266,10 @@ typedef struct entity_render_s // 4 frame numbers (-1 if not used) and their blending scalers (0-1), if interpolation is not desired, use frame instead frameblend_t frameblend[4]; - // caching results of static light traces (this is semi-persistent) - double entlightstime; - vec3_t entlightsorigin; - int entlightsframe; - int numentlights; - unsigned short entlights[MAXENTLIGHTS]; + // current lighting from map + vec3_t modellight_ambient; + vec3_t modellight_diffuse; // q3bsp + vec3_t modellight_lightdir; // q3bsp } entity_render_t; @@ -376,14 +360,14 @@ typedef struct scoreboard_s int qw_ping; int qw_packetloss; int qw_spectator; + char qw_team[8]; char qw_skin[MAX_QPATH]; - cachepic_t *qw_skin_cachepic; // skins are loaded as cachepics } scoreboard_t; typedef struct cshift_s { - int destcolor[3]; - int percent; // 0-256 + float destcolor[3]; + float percent; // 0-256 } cshift_t; #define CSHIFT_CONTENTS 0 @@ -423,6 +407,15 @@ typedef enum qw_downloadtype_e } qw_downloadtype_t; +typedef enum capturevideoformat_e +{ + CAPTUREVIDEOFORMAT_TARGA, + CAPTUREVIDEOFORMAT_JPEG, + CAPTUREVIDEOFORMAT_RAWRGB, + CAPTUREVIDEOFORMAT_RAWYV12 +} +capturevideoformat_t; + // // the client_static_t structure is persistent through an arbitrary number // of server connections @@ -431,6 +424,10 @@ typedef struct client_static_s { cactive_t state; + // all client memory allocations go in these pools + mempool_t *levelmempool; + mempool_t *permanentmempool; + // demo loop control // -1 = don't play demos int demonum; @@ -498,6 +495,19 @@ typedef struct client_static_s // this normally contains the following keys in quakeworld: // password spectator name team skin topcolor bottomcolor rate noaim msg *ver *ip char userinfo[MAX_USERINFO_STRING]; + + // video capture stuff + qboolean capturevideo_active; + capturevideoformat_t capturevideo_format; + double capturevideo_starttime; + double capturevideo_framerate; + int capturevideo_soundrate; + int capturevideo_frame; + unsigned char *capturevideo_buffer; + qfile_t *capturevideo_videofile; + qfile_t *capturevideo_soundfile; + short capturevideo_rgbtoyuvscaletable[3][3][256]; + unsigned char capturevideo_yuvnormalizetable[3][256]; } client_static_t; @@ -523,6 +533,72 @@ 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, + PARTICLE_SPARK = 1, + PARTICLE_ORIENTED_DOUBLESIDED = 2, + PARTICLE_BEAM = 3 +} +porientation_t; + +typedef enum +{ + PBLEND_ALPHA = 0, + PBLEND_ADD = 1, + PBLEND_MOD = 2 +} +pblend_t; + +typedef struct particletype_s +{ + pblend_t blendmode; + porientation_t orientation; + qboolean lighting; +} +particletype_t; + +typedef enum +{ + pt_alphastatic, pt_static, pt_spark, pt_beam, pt_rain, pt_raindecal, pt_snow, pt_bubble, pt_blood, pt_smoke, pt_decal, pt_entityparticle, pt_total +} +ptype_t; + +typedef struct particle_s +{ + particletype_t *type; + int texnum; + vec3_t org; + vec3_t vel; // velocity of particle, or orientation of decal, or end point of beam + float size; + float sizeincrease; // rate of size change per second + float alpha; // 0-255 + float alphafade; // how much alpha reduces per second + float time2; // used for snow fluttering and decal fade + float bounce; // how much bounce-back from a surface the particle hits (0 = no physics, 1 = stop and slide, 2 = keep bouncing forever, 1.5 is typical) + float gravity; // how much gravity affects this particle (1.0 = normal gravity, 0.0 = none) + float airfriction; // how much air friction affects this object (objects with a low mass/size ratio tend to get more air friction) + float liquidfriction; // how much liquid friction affects this object (objects with a low mass/size ratio tend to get more liquid friction) + unsigned char color[4]; + unsigned short owner; // decal stuck to this entity + 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 +} +particle_t; + // // the client_state_t structure is wiped completely at every // server signon @@ -577,6 +653,12 @@ typedef struct client_state_s vec3_t mvelocity[2], velocity; // update by server, can be used by mods for zooming vec_t mviewzoom[2], viewzoom; + // if true interpolation the mviewangles and other interpolation of the + // player is disabled until the next network packet + // this is used primarily by teleporters, and when spectating players + // special checking of the old fixangle[1] is used to differentiate + // between teleporting and spectating + qboolean fixangle[2]; // client movement simulation // these fields are only updated by CL_ClientMovement (called by CL_SendMove after parsing each network packet) @@ -586,6 +668,8 @@ typedef struct client_state_s 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]; // simulated data (this is valid even if cl.movement is false) vec3_t movement_origin; vec3_t movement_oldorigin; @@ -625,7 +709,7 @@ typedef struct client_state_s // don't change view angle, full screen, etc int intermission; // latched at intermission start - int completed_time; + double completed_time; // the timestamp of the last two messages double mtime[2]; @@ -633,7 +717,10 @@ 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 - double time, oldtime, frametime; + 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) + double realframetime; // copy of realtime from last recieved message, for net trouble icon float last_received_message; @@ -695,14 +782,66 @@ typedef struct client_state_s entityframe4_database_t *entitydatabase4; entityframeqw_database_t *entitydatabaseqw; + // keep track of quake entities because they need to be killed if they get stale + int lastquakeentity; + unsigned char isquakeentity[MAX_EDICTS]; + + // bounding boxes for clientside movement + vec3_t playerstandmins; + vec3_t playerstandmaxs; + vec3_t playercrouchmins; + vec3_t playercrouchmaxs; + + int max_entities; + int max_csqcentities; + int max_static_entities; + int max_temp_entities; + int max_effects; + int max_beams; + int max_dlights; + int max_lightstyle; + int max_brushmodel_entities; + 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; + beam_t *beams; + dlight_t *dlights; + lightstyle_t *lightstyle; + int *brushmodel_entities; + particle_t *particles; + + int num_entities; + int num_csqcentities; //[515]: csqc + int num_static_entities; + int num_temp_entities; + int num_brushmodel_entities; + int num_effects; + int num_beams; + int num_dlights; + int num_particles; + + int free_particle; + // quakeworld stuff // local copy of the server infostring char qw_serverinfo[MAX_SERVERINFO_STRING]; + // time of last qw "pings" command sent to server while showing scores + double last_ping_request; + // used during connect int qw_servercount; + // updated from serverinfo + int qw_teamplay; + // indicates whether the player is spectating qboolean qw_spectator; @@ -730,6 +869,14 @@ typedef struct client_state_s // 255 is the most nails the QW protocol could send int qw_num_nails; vec_t qw_nails[255][6]; + + float qw_weaponkick; + + int qw_validsequence; + + qw_usercmd_t qw_moves[QW_UPDATE_BACKUP]; + + int qw_deltasequence[QW_UPDATE_BACKUP]; } client_state_t; @@ -778,6 +925,9 @@ extern cvar_t m_yaw; extern cvar_t m_forward; extern cvar_t m_side; +extern cvar_t cl_autodemo; +extern cvar_t cl_autodemo_nameformat; + extern cvar_t r_draweffects; extern cvar_t cl_explosions_alpha_start; @@ -790,45 +940,6 @@ 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; - -extern mempool_t *cl_mempool; - -extern int cl_max_entities; -extern int cl_max_csqcentities; -extern int cl_max_static_entities; -extern int cl_max_temp_entities; -extern int cl_max_effects; -extern int cl_max_beams; -extern int cl_max_dlights; -extern int cl_max_lightstyle; -extern int cl_max_brushmodel_entities; -extern int cl_activedlights; - -extern entity_t *cl_entities; -extern entity_t *cl_csqcentities; //[515]: csqc -extern unsigned char *cl_entities_active; -extern unsigned char *cl_csqcentities_active; //[515]: csqc -extern entity_t *cl_static_entities; -extern entity_t *cl_temp_entities; -extern cl_effect_t *cl_effects; -extern beam_t *cl_beams; -extern dlight_t *cl_dlights; -extern lightstyle_t *cl_lightstyle; -extern int *cl_brushmodel_entities; - -// these are updated by CL_ClearState -extern int cl_num_entities; -extern int cl_num_csqcentities; //[515]: csqc -extern int cl_num_static_entities; -extern int cl_num_temp_entities; -extern int cl_num_brushmodel_entities; - -extern char qw_emodel_name[], qw_pmodel_name[], qw_prespawn_name[], qw_modellist_name[], qw_soundlist_name[]; - 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); @@ -883,6 +994,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float void CL_ClearState (void); 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); @@ -938,7 +1050,6 @@ 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; extern cvar_t cl_particles_blood_bloodhack; @@ -960,35 +1071,67 @@ void CL_Particles_Clear(void); void CL_Particles_Init(void); void CL_Particles_Shutdown(void); +typedef enum effectnameindex_s +{ + EFFECT_NONE, + EFFECT_TE_GUNSHOT, + EFFECT_TE_GUNSHOTQUAD, + EFFECT_TE_SPIKE, + EFFECT_TE_SPIKEQUAD, + EFFECT_TE_SUPERSPIKE, + EFFECT_TE_SUPERSPIKEQUAD, + EFFECT_TE_WIZSPIKE, + EFFECT_TE_KNIGHTSPIKE, + EFFECT_TE_VORESPIKE, + EFFECT_TE_EXPLOSION, + EFFECT_TE_EXPLOSIONQUAD, + EFFECT_TE_TAREXPLOSION, + EFFECT_TE_TELEPORT, + EFFECT_TE_LAVASPLASH, + EFFECT_TE_SMALLFLASH, + EFFECT_TE_FLAMEJET, + EFFECT_EF_FLAME, + EFFECT_TE_BLOOD, + EFFECT_TE_SPARK, + EFFECT_TE_PLASMABURN, + EFFECT_TE_TEI_G3, + EFFECT_TE_TEI_SMOKE, + EFFECT_TE_TEI_BIGEXPLOSION, + EFFECT_TE_TEI_PLASMAHIT, + EFFECT_EF_STARDUST, + EFFECT_TR_ROCKET, + EFFECT_TR_GRENADE, + EFFECT_TR_BLOOD, + EFFECT_TR_WIZSPIKE, + EFFECT_TR_SLIGHTBLOOD, + EFFECT_TR_KNIGHTSPIKE, + EFFECT_TR_VORESPIKE, + EFFECT_TR_NEHAHRASMOKE, + EFFECT_TR_NEXUIZPLASMA, + EFFECT_TR_GLOWTRAIL, + EFFECT_SVC_PARTICLE, + EFFECT_TOTAL +} +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_ParseParticleEffect (void); -void CL_RunParticleEffect (vec3_t org, vec3_t dir, int color, int count); -void CL_RocketTrail (vec3_t start, vec3_t end, int type, int color, entity_t *ent); -void CL_SparkShower (vec3_t org, vec3_t dir, int count, vec_t gravityscale, vec_t radius); -void CL_Smoke (vec3_t org, vec3_t dir, int count, vec_t radius); -void CL_BulletMark (vec3_t org); -void CL_PlasmaBurn (vec3_t org); -void CL_BloodPuff (vec3_t org, vec3_t vel, int count); -void CL_Stardust (vec3_t mins, vec3_t maxs, int count); -void CL_FlameCube (vec3_t mins, vec3_t maxs, int count); -void CL_Flames (vec3_t org, vec3_t vel, int count); -void CL_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count); -void CL_ParticleCube (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int gravity, int randomvel); -void CL_ParticleRain (vec3_t mins, vec3_t maxs, vec3_t dir, int count, int colorbase, int type); -void CL_EntityParticles (entity_t *ent); -void CL_BlobExplosion (vec3_t org); -void CL_ParticleExplosion (vec3_t org); -void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength); -void CL_LavaSplash (vec3_t org); -void CL_TeleportSplash (vec3_t org); -void CL_BeamParticle (const vec3_t start, const vec3_t end, vec_t radius, float red, float green, float blue, float alpha, float lifetime); -void CL_Tei_Smoke(const vec3_t pos, const vec3_t dir, int count); -void CL_Tei_PlasmaHit(const vec3_t pos, const vec3_t dir, int count); +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); +void CL_EntityParticles (const entity_t *ent); +void CL_ParticleExplosion (const vec3_t org); +void CL_ParticleExplosion2 (const vec3_t org, int colorStart, int colorLength); void CL_MoveParticles(void); void R_MoveExplosions(void); -void R_NewExplosion(vec3_t org); +void R_NewExplosion(const vec3_t org); #include "cl_screen.h" +#define NUMCROSSHAIRS 32 +extern cachepic_t *r_crosshairs[NUMCROSSHAIRS+1]; + typedef struct refdef_s { // area to render in @@ -1033,17 +1176,11 @@ typedef struct refdef_s // 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 - unsigned char *drawqueue; - int drawqueuesize; - int maxdrawqueuesize; + qboolean draw2dstage; } refdef_t; extern refdef_t r_refdef; -#include "cgamevm.h" - #endif