X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=client.h;h=5e2831d555f83159d688f30052e84080df4c5ce9;hb=afb294d3637a9fe79fb26e479aadb53516de71a8;hp=ca030ddcfba80674665393406120c2202ea08f72;hpb=87018a5da0b6005adb83c4dffb57745aefff449a;p=xonotic%2Fdarkplaces.git diff --git a/client.h b/client.h index ca030ddc..5e2831d5 100644 --- a/client.h +++ b/client.h @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -19,6 +19,70 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // client.h +typedef struct frameblend_s +{ + int frame; + float lerp; +} +frameblend_t; + +// LordHavoc: nothing in this structure is persistant, it may be overwritten by the client every frame, for persistant data use entity_lerp_t. +typedef struct entity_render_s +{ + vec3_t origin; // location + vec3_t angles; // orientation + float alpha; // opacity (alpha) of the model + float scale; // size the model is shown + + model_t *model; // NULL = no model + int frame; // current uninterpolated animation frame (for things which do not use interpolation) + int colormap; // entity shirt and pants colors + int effects; // light, particles, etc + int skinnum; // for Alias models + int flags; // render flags + + // these are copied from the persistent data + int frame1; // frame that the model is interpolating from + int frame2; // frame that the model is interpolating to + double framelerp; // interpolation factor, usually computed from frame2time + double frame1time; // time frame1 began playing (for framegroup animations) + double frame2time; // time frame2 began playing (for framegroup animations) + + // calculated by the renderer (but not persistent) + int visframe; // if visframe == r_framecount, it is visible + vec3_t mins, maxs; // calculated during R_AddModelEntities + frameblend_t frameblend[4]; // 4 frame numbers (-1 if not used) and their blending scalers (0-1), if interpolation is not desired, use frame instead +} +entity_render_t; + +typedef struct entity_persistent_s +{ + // particles + vec3_t trail_origin; // trail rendering + float trail_time; // trail rendering + + // interpolated animation + int modelindex; // lerp resets when model changes + int frame1; // frame that the model is interpolating from + int frame2; // frame that the model is interpolating to + double framelerp; // interpolation factor, usually computed from frame2time + double frame1time; // time frame1 began playing (for framegroup animations) + double frame2time; // time frame2 began playing (for framegroup animations) +} +entity_persistent_t; + +typedef struct entity_s +{ + entity_state_t state_baseline; // baseline state (default values) + entity_state_t state_previous; // previous state (interpolating from this) + entity_state_t state_current; // current state (interpolating to this) + + entity_persistent_t persistent; // used for regenerating parts of render + + entity_render_t render; // the only data the renderer should know about +} +entity_t; + typedef struct { vec3_t viewangles; @@ -40,8 +104,7 @@ typedef struct char name[MAX_SCOREBOARDNAME]; float entertime; int frags; - int colors; // two 4 bit fields - byte translations[VID_GRADES*256]; + int colors; // two 4 bit fields } scoreboard_t; typedef struct @@ -65,21 +128,6 @@ typedef struct #define SIGNONS 4 // signon messages to receive before connected -// LordHavoc: 256 dynamic lights -#define MAX_DLIGHTS 256 -typedef struct -{ - vec3_t origin; - float radius; - float die; // stop lighting after this time - float decay; // drop this each second - float minlight; // don't add when contributing less - int key; - vec3_t color; // LordHavoc: colored lighting - qboolean dark; // subtracts light instead of adding -} dlight_t; - - #define MAX_BEAMS 24 typedef struct { @@ -87,20 +135,20 @@ typedef struct struct model_s *model; float endtime; vec3_t start, end; -} beam_t; - -// LordHavoc: increased MAX_EFRAGS from 640 to 2048 -#define MAX_EFRAGS 2048 +} +beam_t; #define MAX_MAPSTRING 2048 #define MAX_DEMOS 8 #define MAX_DEMONAME 16 -typedef enum { -ca_dedicated, // a dedicated server with no ability to start a client -ca_disconnected, // full screen console with no connection -ca_connected // valid netcon, talking to a server -} cactive_t; +typedef enum +{ + ca_dedicated, // a dedicated server with no ability to start a client + ca_disconnected, // full screen console with no connection + ca_connected // valid netcon, talking to a server +} +cactive_t; // // the client_static_t structure is persistant through an arbitrary number @@ -110,7 +158,7 @@ typedef struct { cactive_t state; -// personalization data sent to server +// personalization data sent to server char mapstring[MAX_QPATH]; char spawnparms[MAX_MAPSTRING]; // to restart a level @@ -124,7 +172,7 @@ typedef struct qboolean demoplayback; qboolean timedemo; int forcetrack; // -1 = use normal cd track - FILE *demofile; + QFile *demofile; int td_lastframe; // to meter out one message a frame int td_startframe; // host_framecount at start double td_starttime; // realtime at second frame of timedemo (LordHavoc: changed to double) @@ -135,8 +183,8 @@ typedef struct int signon; // 0 to SIGNONS struct qsocket_s *netcon; sizebuf_t message; // writing buffer to send to server - -} client_static_t; +} +client_static_t; extern client_static_t cls; @@ -148,14 +196,14 @@ typedef struct { int movemessages; // since connecting to this server // throw out the first couple, so the player - // doesn't accidentally do something the + // doesn't accidentally do something the // first frame usercmd_t cmd; // last command sent to the server // information for local display int stats[MAX_CL_STATS]; // health, etc int items; // inventory bit flags - float item_gettime[32]; // cl.time of aquiring item, for blinking + float item_gettime[32]; // cl.time of acquiring item, for blinking float faceanimtime; // use anim frame if cl.time < this cshift_t cshifts[NUM_CSHIFTS]; // color shifts for damage, powerups @@ -168,13 +216,14 @@ typedef struct vec3_t mviewangles[2]; // during demo playback viewangles is lerped // between these vec3_t viewangles; - + vec3_t mvelocity[2]; // update by server, used for lean+bob // (0 is newest) vec3_t velocity; // lerped between mvelocity[0] and [1] vec3_t punchangle; // temporary offset - + vec3_t punchvector; // LordHavoc: origin view kick + // pitch drifting vars float idealpitch; float pitchvel; @@ -188,17 +237,19 @@ typedef struct qboolean paused; // send over by server qboolean onground; qboolean inwater; - + int intermission; // don't change view angle, full screen, etc int completed_time; // latched at intermission start - - double mtime[2]; // the timestamp of last two messages + + double mtime[2]; // the timestamp of last two messages double time; // clients view of time, should be between // servertime and oldservertime to generate // a lerp point for other data double oldtime; // previous cl.time, time-oldtime is used // to decay light values and smooth step ups - + + double frametime; + float last_received_message; // (realtime) for net trouble icon @@ -215,8 +266,7 @@ typedef struct // refresh related state struct model_s *worldmodel; // cl_entitites[0].model - struct efrag_s *free_efrags; - int num_entities; // held in cl_entities array +// int num_entities; // held in cl_entities array int num_statics; // held in cl_staticentities array entity_t viewent; // the gun model @@ -224,81 +274,75 @@ typedef struct // frag scoreboard scoreboard_t *scores; // [cl.maxclients] -} client_state_t; +} +client_state_t; +extern mempool_t *cl_scores_mempool; // // cvars // -extern cvar_t cl_name; -extern cvar_t cl_color; -extern cvar_t cl_pmodel; +extern cvar_t cl_name; +extern cvar_t cl_color; +extern cvar_t cl_pmodel; + +extern cvar_t cl_upspeed; +extern cvar_t cl_forwardspeed; +extern cvar_t cl_backspeed; +extern cvar_t cl_sidespeed; -extern cvar_t cl_upspeed; -extern cvar_t cl_forwardspeed; -extern cvar_t cl_backspeed; -extern cvar_t cl_sidespeed; +extern cvar_t cl_movespeedkey; -extern cvar_t cl_movespeedkey; +extern cvar_t cl_yawspeed; +extern cvar_t cl_pitchspeed; -extern cvar_t cl_yawspeed; -extern cvar_t cl_pitchspeed; +extern cvar_t cl_anglespeedkey; -extern cvar_t cl_anglespeedkey; +extern cvar_t cl_autofire; -extern cvar_t cl_autofire; +extern cvar_t cl_shownet; +extern cvar_t cl_nolerp; -extern cvar_t cl_shownet; -extern cvar_t cl_nolerp; +extern cvar_t cl_pitchdriftspeed; +extern cvar_t lookspring; +extern cvar_t lookstrafe; +extern cvar_t sensitivity; -extern cvar_t cl_pitchdriftspeed; -extern cvar_t lookspring; -extern cvar_t lookstrafe; -extern cvar_t sensitivity; +extern cvar_t freelook; -extern cvar_t m_pitch; -extern cvar_t m_yaw; -extern cvar_t m_forward; -extern cvar_t m_side; +extern cvar_t m_pitch; +extern cvar_t m_yaw; +extern cvar_t m_forward; +extern cvar_t m_side; -#define MAX_TEMP_ENTITIES 64 // lightning bolts, etc -#define MAX_STATIC_ENTITIES 128 // torches, etc +// LordHavoc: raised these from 64 and 128 to 512 and 256 +#define MAX_TEMP_ENTITIES 512 // lightning bolts, effects, etc +#define MAX_STATIC_ENTITIES 256 // torches, etc -extern client_state_t cl; +extern client_state_t cl; // FIXME, allocate dynamically -extern efrag_t cl_efrags[MAX_EFRAGS]; extern entity_t cl_entities[MAX_EDICTS]; extern entity_t cl_static_entities[MAX_STATIC_ENTITIES]; extern lightstyle_t cl_lightstyle[MAX_LIGHTSTYLES]; -extern dlight_t cl_dlights[MAX_DLIGHTS]; extern entity_t cl_temp_entities[MAX_TEMP_ENTITIES]; extern beam_t cl_beams[MAX_BEAMS]; +#include "cl_light.h" + //============================================================================= // // cl_main // -dlight_t *CL_AllocDlight (int key); -void CL_DecayLights (void); void CL_Init (void); void CL_EstablishConnection (char *host); -void CL_Signon1 (void); -void CL_Signon2 (void); -void CL_Signon3 (void); -void CL_Signon4 (void); void CL_Disconnect (void); void CL_Disconnect_f (void); -void CL_NextDemo (void); - -#define MAX_VISEDICTS 256 -extern int cl_numvisedicts; -extern entity_t *cl_visedicts[MAX_VISEDICTS]; // // cl_input @@ -307,7 +351,8 @@ typedef struct { int down[2]; // key nums holding it down int state; // low bit is down state -} kbutton_t; +} +kbutton_t; extern kbutton_t in_mlook, in_klook; extern kbutton_t in_strafe; @@ -317,9 +362,14 @@ void CL_InitInput (void); void CL_SendCmd (void); void CL_SendMove (usercmd_t *cmd); +void CL_LerpUpdate(entity_t *e); void CL_ParseTEnt (void); void CL_UpdateTEnts (void); +entity_t *CL_NewTempEntity (void); + +void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate); + void CL_ClearState (void); @@ -337,6 +387,7 @@ char *Key_KeynumToString (int keynum); void CL_StopPlayback (void); int CL_GetMessage (void); +void CL_NextDemo (void); void CL_Stop_f (void); void CL_Record_f (void); void CL_PlayDemo_f (void); @@ -345,8 +396,9 @@ void CL_TimeDemo_f (void); // // cl_parse.c // -void CL_ParseServerMessage (void); -void CL_NewTranslation (int slot); +void CL_Parse_Init(void); +void CL_ParseServerMessage(void); +void CL_BitProfile_f(void); // // view @@ -354,15 +406,105 @@ void CL_NewTranslation (int slot); void V_StartPitchDrift (void); void V_StopPitchDrift (void); -void V_RenderView (void); -void V_UpdatePalette (void); -void V_Register (void); +void V_Init (void); +float V_CalcRoll (vec3_t angles, vec3_t velocity); +void V_UpdateBlends (void); void V_ParseDamage (void); -void V_SetContentsColor (int contents); // // cl_tent // void CL_InitTEnts (void); -void CL_SignonReply (void); + +// +// cl_part +// + +#define PARTICLE_INVALID 0 +#define PARTICLE_BILLBOARD 1 +#define PARTICLE_UPRIGHT_FACING 2 +#define PARTICLE_ORIENTED_DOUBLESIDED 3 + +typedef struct renderparticle_s +{ + int tex; + int orientation; + int additive; + int dynlight; + float scalex; + float scaley; + float org[3]; + float dir[3]; + float color[4]; +} +renderparticle_t; + +void CL_Particles_Clear(void); +void CL_Particles_Init(void); + +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, entity_t *ent); +void CL_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent); +void CL_SparkShower (vec3_t org, vec3_t dir, int count); +void CL_PlasmaBurn (vec3_t org); +void CL_BloodPuff (vec3_t org, vec3_t vel, 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, int smoke); +void CL_ParticleExplosion2 (vec3_t org, int colorStart, int colorLength); +void CL_LavaSplash (vec3_t org); +void CL_TeleportSplash (vec3_t org); +void CL_MoveParticles(void); +void R_MoveExplosions(void); +void R_NewExplosion(vec3_t org); + +// if contents is not zero, it will impact on content changes +// (leafs matching contents are considered empty, others are solid) +extern int traceline_endcontents; // set by TraceLine +// need to call this sometime before using TraceLine with hitbmodels +void TraceLine_ScanForBModels(void); +float TraceLine (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal, int contents, int hitbmodels); + +#include "cl_screen.h" + +#define MAX_VISEDICTS (MAX_EDICTS + MAX_STATIC_ENTITIES + MAX_TEMP_ENTITIES) + +typedef struct +{ + // area to render in + int x, y, width, height; + float fov_x, fov_y; + + // view point + vec3_t vieworg; + vec3_t viewangles; + + // fullscreen color blend + float viewblend[4]; + + // weapon model + entity_render_t viewent; + + int numentities; + entity_render_t **entities; + + int numparticles; + struct renderparticle_s *particles; + + byte drawqueue[MAX_DRAWQUEUE]; + int drawqueuesize; +} +refdef_t; + +refdef_t r_refdef; + +extern mempool_t *cl_refdef_mempool; + +#include "cgamevm.h"