X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=client.h;h=b26d51985f27435f275bfdf1f1a86d797ac9f19f;hp=aefee561d8324ff3e2cebbc74c46b2a0c0d63e74;hb=f575e5ad7f9eab64e89b714e75ff5dd92e49f373;hpb=0e6bd6de5aa017acce8df1e8ece2fe5c48d44e4c diff --git a/client.h b/client.h index aefee561..b26d5198 100644 --- a/client.h +++ b/client.h @@ -32,11 +32,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct tridecal_s { // color and initial alpha value - unsigned char colors[3][4]; + float texcoord2f[3][2]; + float vertex3f[3][3]; + unsigned char color4ub[3][4]; // how long this decal has lived so far (the actual fade begins at cl_decals_time) float lived; // if >= 0 this indicates the decal should follow an animated triangle int triangleindex; + // for visibility culling + int surfaceindex; + // old decals are killed to obey cl_decals_max + int decalsequence; } tridecal_t; @@ -83,6 +89,13 @@ typedef struct beam_s } beam_t; +typedef struct rtlight_particle_s +{ + float origin[3]; + float color[3]; +} +rtlight_particle_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 @@ -135,8 +148,31 @@ typedef struct rtlight_s float corona_visibility; unsigned int corona_queryindex_visiblepixels; unsigned int corona_queryindex_allpixels; - /// this is R_Shadow_Cubemap(rtlight->cubemapname) + /// this is R_GetCubemap(rtlight->cubemapname) rtexture_t *currentcubemap; + /// set by R_Shadow_PrepareLight to decide whether R_Shadow_DrawLight should draw it + qboolean draw; + /// these fields are set by R_Shadow_PrepareLight for later drawing + int cached_numlightentities; + int cached_numlightentities_noselfshadow; + int cached_numshadowentities; + int cached_numshadowentities_noselfshadow; + int cached_numsurfaces; + struct entity_render_s **cached_lightentities; + struct entity_render_s **cached_lightentities_noselfshadow; + struct entity_render_s **cached_shadowentities; + struct entity_render_s **cached_shadowentities_noselfshadow; + unsigned char *cached_shadowtrispvs; + unsigned char *cached_lighttrispvs; + int *cached_surfacelist; + // reduced light cullbox from GetLightInfo + vec3_t cached_cullmins; + vec3_t cached_cullmaxs; + // current shadow-caster culling planes based on view + // (any geometry outside these planes can not contribute to the visible + // shadows in any way, and thus can be culled safely) + int cached_numfrustumplanes; + mplane_t cached_frustumplanes[5]; // see R_Shadow_ComputeShadowCasterCullingPlanes /// static light info /// true if this light should be compiled as a static light @@ -173,6 +209,11 @@ typedef struct rtlight_s /// masks of all shadowmap sides that have any potential static receivers or casters int static_shadowmap_receivers; int static_shadowmap_casters; + /// particle-tracing cache for global illumination + int particlecache_numparticles; + int particlecache_maxparticles; + int particlecache_updateparticle; + rtlight_particle_t *particlecache_particles; } rtlight_t; @@ -330,9 +371,19 @@ typedef struct entity_render_s vec3_t mins, maxs; // subframe numbers (-1 if not used) and their blending scalers (0-1), if interpolation is not desired, use subframeblend[0].subframe frameblend_t frameblend[MAX_FRAMEBLENDS]; - - // animation cache index - int animcacheindex; + // skeletal animation data (if skeleton.relativetransforms is not NULL, it overrides frameblend) + skeleton_t *skeleton; + + // animation cache (pointers allocated using R_FrameData_Alloc) + // ONLY valid during R_RenderView! may be NULL (not cached) + float *animcache_vertex3f; + float *animcache_normal3f; + float *animcache_svector3f; + float *animcache_tvector3f; + // interleaved arrays for rendering and dynamic vertex buffers for them + r_meshbuffer_t *animcache_vertex3fbuffer; + r_vertexmesh_t *animcache_vertexmesh; + r_meshbuffer_t *animcache_vertexmeshbuffer; // current lighting from map (updated ONLY by client code, not renderer) vec3_t modellight_ambient; @@ -347,6 +398,9 @@ typedef struct entity_render_s // FIELDS UPDATED BY RENDERER: // last time visible during trace culling double last_trace_visibility; + + // user wavefunc parameters (from csqc) + float userwavefunc_param[Q3WAVEFUNC_USER_COUNT]; } entity_render_t; @@ -443,6 +497,7 @@ typedef struct scoreboard_s float qw_entertime; int qw_ping; int qw_packetloss; + int qw_movementloss; int qw_spectator; char qw_team[8]; char qw_skin[MAX_QPATH]; @@ -493,7 +548,7 @@ qw_downloadtype_t; typedef enum capturevideoformat_e { CAPTUREVIDEOFORMAT_AVI_I420, - CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA, + CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA } capturevideoformat_t; @@ -666,8 +721,19 @@ typedef struct client_static_s // password spectator name team skin topcolor bottomcolor rate noaim msg *ver *ip char userinfo[MAX_USERINFO_STRING]; + // extra user info for the "connect" command + char connect_userinfo[MAX_USERINFO_STRING]; + // video capture stuff capturevideostate_t capturevideo; + + // crypto channel + crypto_t crypto; + + // ProQuake compatibility stuff + int proquake_servermod; // 0 = not proquake, 1 = proquake + int proquake_serverversion; // actual proquake server version * 10 (3.40 = 34, etc) + int proquake_serverflags; // 0 (PQF_CHEATFREE not supported) } client_static_t; @@ -722,7 +788,7 @@ typedef struct particletype_s } particletype_t; -typedef enum +typedef enum ptype_e { pt_dead, 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 } @@ -733,6 +799,7 @@ typedef struct decal_s // fields used by rendering: (44 bytes) unsigned short typeindex; unsigned short texnum; + int decalsequence; vec3_t org; vec3_t normal; float size; @@ -752,33 +819,43 @@ decal_t; typedef struct particle_s { - // fields used by rendering: (40 bytes) + // for faster batch rendering, particles are rendered in groups by effect (resulting in less perfect sorting but far less state changes) + + // fields used by rendering: (48 bytes) + vec3_t sortorigin; // sort by this group origin, not particle org + vec3_t org; + vec3_t vel; // velocity of particle, or orientation of decal, or end point of beam + float size; + float alpha; // 0-255 + float stretch; // only for sparks + + // fields not used by rendering: (44 bytes) + float stainsize; + float stainalpha; + float sizeincrease; // rate of size change per second + 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) +// 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 + + // short variables grouped to save memory (4 bytes) + short angle; // base rotation of particle + short spin; // geometry rotation speed around the particle center normal + + // byte variables grouped to save memory (12 bytes) + unsigned char color[3]; + unsigned char qualityreduction; // enables skipping of this particle according to r_refdef.view.qualityreduction unsigned char typeindex; - pblend_t blendmode; - porientation_t orientation; + unsigned char blendmode; + unsigned char orientation; unsigned char texnum; - vec3_t org; - vec3_t vel; // velocity of particle, or orientation of decal, or end point of beam - float size; - float alpha; // 0-255 - unsigned char color[3]; - unsigned char qualityreduction; // enables skipping of this particle according to r_refdef.view.qualityreduction - float stretch; // only for sparks - int staincolor; + unsigned char staincolor[3]; signed char staintexnum; - float stainsizefactor; - - // fields not used by rendering: (40 bytes) - float sizeincrease; // rate of size change per second - 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) - 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; @@ -885,6 +962,17 @@ typedef struct client_state_s // whether the replay should allow a jump at the first sequence qboolean movement_replay_canjump; + // previous gun angles (for leaning effects) + vec3_t gunangles_prev; + vec3_t gunangles_highpass; + vec3_t gunangles_adjustment_lowpass; + vec3_t gunangles_adjustment_highpass; + // previous gun angles (for leaning effects) + vec3_t gunorg_prev; + vec3_t gunorg_highpass; + vec3_t gunorg_adjustment_lowpass; + vec3_t gunorg_adjustment_highpass; + // pitch drifting vars float idealpitch; float pitchvel; @@ -896,6 +984,7 @@ typedef struct client_state_s float sensitivityscale; csqc_vidvars_t csqc_vidvars; //[515]: these parms must be set to true by default qboolean csqc_wantsmousemove; + qboolean csqc_paused; // vortex: int because could be flags struct model_s *csqc_model_precache[MAX_MODELS]; // local amount for smoothing stepups @@ -910,6 +999,9 @@ typedef struct client_state_s qboolean oldonground; double lastongroundtime; double hitgroundtime; + float bob2_smooth; + float bobfall_speed; + float bobfall_swing; // don't change view angle, full screen, etc int intermission; @@ -947,7 +1039,11 @@ typedef struct client_state_s char sound_name[MAX_SOUNDS][MAX_QPATH]; // for display on solo scoreboard - char levelname[40]; + char worldmessage[40]; // map title (not related to filename) + // variants of map name + char worldbasename[MAX_QPATH]; // %s + char worldname[MAX_QPATH]; // maps/%s.bsp + char worldnamenoextension[MAX_QPATH]; // maps/%s // cl_entitites[cl.viewentity] = player int viewentity; // the real player entity (normally same as viewentity, @@ -1006,8 +1102,10 @@ typedef struct client_state_s // entity database stuff // latest received entity frame numbers -#define LATESTFRAMENUMS 3 +#define LATESTFRAMENUMS 32 + int latestframenumsposition; int latestframenums[LATESTFRAMENUMS]; + int latestsendnums[LATESTFRAMENUMS]; entityframe_database_t *entitydatabase; entityframe4_database_t *entitydatabase4; entityframeqw_database_t *entitydatabaseqw; @@ -1022,6 +1120,9 @@ typedef struct client_state_s vec3_t playercrouchmins; vec3_t playercrouchmaxs; + // old decals are killed based on this + int decalsequence; + int max_entities; int max_csqcrenderentities; int max_static_entities; @@ -1118,13 +1219,17 @@ typedef struct client_state_s float movevars_airstopaccelerate; float movevars_airstrafeaccelerate; float movevars_maxairstrafespeed; + float movevars_airstrafeaccel_qw; float movevars_aircontrol; + float movevars_aircontrol_power; + float movevars_aircontrol_penalty; float movevars_warsowbunny_airforwardaccel; float movevars_warsowbunny_accel; float movevars_warsowbunny_topspeed; float movevars_warsowbunny_turnaccel; float movevars_warsowbunny_backtosideratio; float movevars_ticrate; + float movevars_airspeedlimit_nonqw; // models used by qw protocol int qw_modelindex_spike; @@ -1218,6 +1323,7 @@ extern cvar_t m_side; extern cvar_t cl_autodemo; extern cvar_t cl_autodemo_nameformat; +extern cvar_t cl_autodemo_delete; extern cvar_t r_draweffects; @@ -1230,6 +1336,7 @@ extern cvar_t cl_stainmaps; extern cvar_t cl_stainmaps_clearonload; extern cvar_t cl_prydoncursor; +extern cvar_t cl_prydoncursor_notrace; extern cvar_t cl_locs_enable; @@ -1249,7 +1356,7 @@ void CL_Locs_FindLocationName(char *buffer, size_t buffersize, vec3_t point); void CL_Shutdown (void); void CL_Init (void); -void CL_EstablishConnection(const char *host); +void CL_EstablishConnection(const char *host, int firstarg); void CL_Disconnect (void); void CL_Disconnect_f (void); @@ -1354,6 +1461,9 @@ extern cvar_t cl_particles_size; extern cvar_t cl_particles_quake; extern cvar_t cl_particles_blood; extern cvar_t cl_particles_blood_alpha; +extern cvar_t cl_particles_blood_decal_alpha; +extern cvar_t cl_particles_blood_decal_scalemin; +extern cvar_t cl_particles_blood_decal_scalemax; extern cvar_t cl_particles_blood_bloodhack; extern cvar_t cl_particles_bulletimpacts; extern cvar_t cl_particles_explosions_sparks; @@ -1372,7 +1482,7 @@ extern cvar_t cl_decals_fadetime; void CL_Particles_Clear(void); void CL_Particles_Init(void); void CL_Particles_Shutdown(void); -particle_t *CL_NewParticle(unsigned short ptypeindex, int pcolor1, int pcolor2, int ptex, float psize, float psizeincrease, float palpha, float palphafade, float pgravity, float pbounce, float px, float py, float pz, float pvx, float pvy, float pvz, float pairfriction, float pliquidfriction, float originjitter, float velocityjitter, qboolean pqualityreduction, float lifetime, float stretch, pblend_t blendmode, porientation_t orientation, int staincolor1, int staincolor2, int staintex); +particle_t *CL_NewParticle(const vec3_t sortorigin, unsigned short ptypeindex, int pcolor1, int pcolor2, int ptex, float psize, float psizeincrease, float palpha, float palphafade, float pgravity, float pbounce, float px, float py, float pz, float pvx, float pvy, float pvz, float pairfriction, float pliquidfriction, float originjitter, float velocityjitter, qboolean pqualityreduction, float lifetime, float stretch, pblend_t blendmode, porientation_t orientation, int staincolor1, int staincolor2, int staintex, float stainalpha, float stainsize, float angle, float spin, float tint[4]); typedef enum effectnameindex_s { @@ -1419,7 +1529,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_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, float tintmins[4], float tintmaxs[4]); 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); @@ -1452,18 +1562,32 @@ typedef struct r_refdef_stats_s int lightmapupdates; int lightmapupdatepixels; int particles; - int decals; - int meshes; - int meshes_elements; + int drawndecals; + int totaldecals; + int draws; + int draws_vertices; + int draws_elements; int lights; int lights_clears; int lights_scissored; int lights_lighttriangles; int lights_shadowtriangles; int lights_dynamicshadowtriangles; + int bouncegrid_lights; + int bouncegrid_particles; + int bouncegrid_traces; + int bouncegrid_hits; + int bouncegrid_splats; + int bouncegrid_bounces; int bloom; int bloom_copypixels; int bloom_drawpixels; + int indexbufferuploadcount; + int indexbufferuploadsize; + int vertexbufferuploadcount; + int vertexbufferuploadsize; + int framedatacurrent; + int framedatasize; } r_refdef_stats_t; @@ -1479,7 +1603,6 @@ r_viewport_type_t; typedef struct r_viewport_s { - double m[16]; matrix4x4_t cameramatrix; // from entity (transforms from camera entity to world) matrix4x4_t viewmatrix; // actual matrix for rendering (transforms to viewspace) matrix4x4_t projectmatrix; // actual projection matrix (transforms from viewspace to screen) @@ -1490,6 +1613,7 @@ typedef struct r_viewport_s int height; int depth; r_viewport_type_t type; + float screentodepth[2]; // used by deferred renderer to calculate linear depth from device depth coordinates } r_viewport_t; @@ -1673,7 +1797,16 @@ typedef struct r_refdef_s qboolean fogenabled; qboolean oldgl_fogenable; - qboolean draw2dstage; + // new flexible texture height fog (overrides normal fog) + char fog_height_texturename[64]; // note: must be 64 for the sscanf code + unsigned char *fog_height_table1d; + unsigned char *fog_height_table2d; + int fog_height_tablesize; // enable + float fog_height_tablescale; + float fog_height_texcoordscale; + char fogheighttexturename[64]; // detects changes to active fog height texture + + int draw2dstage; // 0 = no, 1 = yes, other value = needs setting up again // true during envmap command capture qboolean envmap;