X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_main.c;h=c4d450a94ef6769dd7782e6e542bd51ec5f9b59c;hp=0a42a264a3ae615883bd83fbd60bf12facf7b447;hb=9cdf3f8ff8114b719a96eb85eb20f3977ac86515;hpb=c98b091c10dc46797648b3ade88ec24076eb092c diff --git a/cl_main.c b/cl_main.c index 0a42a264..c4d450a9 100644 --- a/cl_main.c +++ b/cl_main.c @@ -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. @@ -20,39 +20,69 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // cl_main.c -- client main loop #include "quakedef.h" +#include "cl_collision.h" +#include "cl_video.h" // we need to declare some mouse variables here, because the menu system // references them even when on a unix system. // these two are not intended to be set directly -cvar_t cl_name = {"_cl_name", "player", true}; -cvar_t cl_color = {"_cl_color", "0", true}; -cvar_t cl_pmodel = {"_cl_pmodel", "0", true}; +cvar_t cl_name = {CVAR_SAVE, "_cl_name", "player"}; +cvar_t cl_color = {CVAR_SAVE, "_cl_color", "0"}; +cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"}; -cvar_t cl_shownet = {"cl_shownet","0"}; // can be 0, 1, or 2 -cvar_t cl_nolerp = {"cl_nolerp","0"}; +cvar_t cl_shownet = {0, "cl_shownet","0"}; +cvar_t cl_nolerp = {0, "cl_nolerp", "0"}; -cvar_t lookspring = {"lookspring","0", true}; -cvar_t lookstrafe = {"lookstrafe","0", true}; -cvar_t sensitivity = {"sensitivity","3", true}; +cvar_t cl_itembobheight = {0, "cl_itembobheight", "8"}; +cvar_t cl_itembobspeed = {0, "cl_itembobspeed", "0.5"}; -cvar_t m_pitch = {"m_pitch","0.022", true}; -cvar_t m_yaw = {"m_yaw","0.022", true}; -cvar_t m_forward = {"m_forward","1", true}; -cvar_t m_side = {"m_side","0.8", true}; +cvar_t lookspring = {CVAR_SAVE, "lookspring","0"}; +cvar_t lookstrafe = {CVAR_SAVE, "lookstrafe","0"}; +cvar_t sensitivity = {CVAR_SAVE, "sensitivity","3", 1, 30}; +cvar_t m_pitch = {CVAR_SAVE, "m_pitch","0.022"}; +cvar_t m_yaw = {CVAR_SAVE, "m_yaw","0.022"}; +cvar_t m_forward = {CVAR_SAVE, "m_forward","1"}; +cvar_t m_side = {CVAR_SAVE, "m_side","0.8"}; + +cvar_t freelook = {CVAR_SAVE, "freelook", "1"}; + +cvar_t r_draweffects = {0, "r_draweffects", "1"}; + +cvar_t cl_explosions = {CVAR_SAVE, "cl_explosions", "1"}; +cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"}; + +mempool_t *cl_scores_mempool; +mempool_t *cl_refdef_mempool; +mempool_t *cl_entities_mempool; client_static_t cls; client_state_t cl; -// FIXME: put these on hunk? -efrag_t cl_efrags[MAX_EFRAGS]; -entity_t cl_entities[MAX_EDICTS]; -entity_t cl_static_entities[MAX_STATIC_ENTITIES]; -lightstyle_t cl_lightstyle[MAX_LIGHTSTYLES]; -dlight_t cl_dlights[MAX_DLIGHTS]; -int cl_numvisedicts; -entity_t *cl_visedicts[MAX_VISEDICTS]; +int cl_max_entities; +int cl_max_static_entities; +int cl_max_temp_entities; +int cl_max_effects; +int cl_max_beams; +int cl_max_dlights; +int cl_max_lightstyle; +int cl_max_brushmodel_entities; + +entity_t *cl_entities; +qbyte *cl_entities_active; +entity_t *cl_static_entities; +entity_t *cl_temp_entities; +cl_effect_t *cl_effects; +beam_t *cl_beams; +dlight_t *cl_dlights; +lightstyle_t *cl_lightstyle; +entity_render_t **cl_brushmodel_entities; + +int cl_num_entities; +int cl_num_static_entities; +int cl_num_temp_entities; +int cl_num_brushmodel_entities; /* ===================== @@ -62,40 +92,57 @@ CL_ClearState */ void CL_ClearState (void) { - int i; + int i; if (!sv.active) Host_ClearMemory (); + Mem_EmptyPool(cl_scores_mempool); + Mem_EmptyPool(cl_entities_mempool); + // wipe the entire cl structure memset (&cl, 0, sizeof(cl)); SZ_Clear (&cls.message); -// clear other arrays - memset (cl_efrags, 0, sizeof(cl_efrags)); - memset (cl_entities, 0, sizeof(cl_entities)); - memset (cl_dlights, 0, sizeof(cl_dlights)); - memset (cl_lightstyle, 0, sizeof(cl_lightstyle)); - memset (cl_temp_entities, 0, sizeof(cl_temp_entities)); - memset (cl_beams, 0, sizeof(cl_beams)); + cl_num_entities = 0; + cl_num_static_entities = 0; + cl_num_temp_entities = 0; + cl_num_brushmodel_entities = 0; + + // tweak these if the game runs out + cl_max_entities = MAX_EDICTS; + cl_max_static_entities = 256; + cl_max_temp_entities = 512; + cl_max_effects = 256; + cl_max_beams = 24; + cl_max_dlights = MAX_DLIGHTS; + cl_max_lightstyle = MAX_LIGHTSTYLES; + cl_max_brushmodel_entities = MAX_EDICTS; + + cl_entities = Mem_Alloc(cl_entities_mempool, cl_max_entities * sizeof(entity_t)); + cl_entities_active = Mem_Alloc(cl_entities_mempool, cl_max_entities * sizeof(qbyte)); + cl_static_entities = Mem_Alloc(cl_entities_mempool, cl_max_static_entities * sizeof(entity_t)); + cl_temp_entities = Mem_Alloc(cl_entities_mempool, cl_max_temp_entities * sizeof(entity_t)); + cl_effects = Mem_Alloc(cl_entities_mempool, cl_max_effects * sizeof(cl_effect_t)); + cl_beams = Mem_Alloc(cl_entities_mempool, cl_max_beams * sizeof(beam_t)); + cl_dlights = Mem_Alloc(cl_entities_mempool, cl_max_dlights * sizeof(dlight_t)); + cl_lightstyle = Mem_Alloc(cl_entities_mempool, cl_max_lightstyle * sizeof(lightstyle_t)); + cl_brushmodel_entities = Mem_Alloc(cl_entities_mempool, cl_max_brushmodel_entities * sizeof(entity_render_t *)); + + CL_Screen_NewMap(); + + CL_Particles_Clear(); + // LordHavoc: have to set up the baseline info for alpha and other stuff - for (i = 0;i < MAX_EDICTS;i++) + for (i = 0;i < cl_max_entities;i++) { - cl_entities[i].baseline.alpha = 255; - cl_entities[i].baseline.scale = 16; - cl_entities[i].baseline.glowsize = 0; - cl_entities[i].baseline.glowcolor = 254; - cl_entities[i].baseline.colormod = 255; + ClearStateToDefault(&cl_entities[i].state_baseline); + ClearStateToDefault(&cl_entities[i].state_previous); + ClearStateToDefault(&cl_entities[i].state_current); } -// -// allocate the efrags and chain together into a free list -// - cl.free_efrags = cl_efrags; - for (i=0 ; i>4, ((int)cl_color.value)&15)); - - if (cl_pmodel.value) - { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("pmodel %f\n", cl_pmodel.value)); - } + if (!ent->state_current.active) + continue; - MSG_WriteByte (&cls.message, clc_stringcmd); - sprintf (str, "spawn %s", cls.spawnparms); - MSG_WriteString (&cls.message, str); - break; - - case 3: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "begin"); - Cache_Report (); // print remaining memory - break; - - case 4: - SCR_EndLoadingPlaque (); // allow normal screen updates - // LordHavoc: debugging purposes - Con_DPrintf("GLQuake texture slots in use: %i : %i : %i texels\n", texture_extension_number, numgltextures, texels); - break; + if (ent->render.model) + strncpy(name, ent->render.model->name, 25); + else + strcpy(name, "--no model--"); + name[25] = 0; + for (j = strlen(name);j < 25;j++) + name[j] = ' '; + Con_Printf ("%3i: %s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha); } } -/* -===================== -CL_NextDemo - -Called to play the next demo in the demo loop -===================== -*/ -void CL_NextDemo (void) +static const vec3_t nomodelmins = {-16, -16, -16}; +static const vec3_t nomodelmaxs = {16, 16, 16}; +void CL_BoundingBoxForEntity(entity_render_t *ent) { - char str[1024]; - - if (cls.demonum == -1) - return; // don't play demos - - SCR_BeginLoadingPlaque (); - - if (!cls.demos[cls.demonum][0] || cls.demonum == MAX_DEMOS) + if (ent->model) { - cls.demonum = 0; - if (!cls.demos[cls.demonum][0]) + if (ent->angles[0] || ent->angles[2]) { - Con_Printf ("No demos listed with startdemos\n"); - cls.demonum = -1; - return; + // pitch or roll + VectorAdd(ent->origin, ent->model->rotatedmins, ent->mins); + VectorAdd(ent->origin, ent->model->rotatedmaxs, ent->maxs); } - } - - sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]); - Cbuf_InsertText (str); - cls.demonum++; -} - -/* -============== -CL_PrintEntities_f -============== -*/ -void CL_PrintEntities_f (void) -{ - entity_t *ent; - int i; - - for (i=0,ent=cl_entities ; imodel) + else if (ent->angles[1]) { - Con_Printf ("EMPTY\n"); - continue; + // yaw + VectorAdd(ent->origin, ent->model->yawmins, ent->mins); + VectorAdd(ent->origin, ent->model->yawmaxs, ent->maxs); } - Con_Printf ("%s:%2i (%5.1f,%5.1f,%5.1f) [%5.1f %5.1f %5.1f]\n" - ,ent->model->name,ent->frame, ent->origin[0], ent->origin[1], ent->origin[2], ent->angles[0], ent->angles[1], ent->angles[2]); - } -} - - -/* -=============== -SetPal - -Debugging tool, just flashes the screen -=============== -*/ -void SetPal (int i) -{ -#if 0 - static int old; - byte pal[768]; - int c; - - if (i == old) - return; - old = i; - - if (i==0) - VID_SetPalette (host_basepal); - else if (i==1) - { - for (c=0 ; c<768 ; c+=3) + else { - pal[c] = 0; - pal[c+1] = 255; - pal[c+2] = 0; + VectorAdd(ent->origin, ent->model->normalmins, ent->mins); + VectorAdd(ent->origin, ent->model->normalmaxs, ent->maxs); } - VID_SetPalette (pal); } else { - for (c=0 ; c<768 ; c+=3) - { - pal[c] = 0; - pal[c+1] = 0; - pal[c+2] = 255; - } - VID_SetPalette (pal); + VectorAdd(ent->origin, nomodelmins, ent->mins); + VectorAdd(ent->origin, nomodelmaxs, ent->maxs); } -#endif } -/* -=============== -CL_AllocDlight - -=============== -*/ -dlight_t *CL_AllocDlight (int key) +void CL_LerpUpdate(entity_t *e) { - int i; - dlight_t *dl; + entity_persistent_t *p; + entity_render_t *r; + p = &e->persistent; + r = &e->render; -// first look for an exact key match - if (key) + if (p->modelindex != e->state_current.modelindex) { - dl = cl_dlights; - for (i=0 ; ikey == key) - { - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; - } - } + // reset all interpolation information + p->modelindex = e->state_current.modelindex; + p->frame1 = p->frame2 = e->state_current.frame; + p->frame1time = p->frame2time = cl.time; + p->framelerp = 1; } - -// then look for anything else - dl = cl_dlights; - for (i=0 ; iframe2 != e->state_current.frame) { - if (dl->die < cl.time) - { - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; - } + // transition to new frame + p->frame1 = p->frame2; + p->frame1time = p->frame2time; + p->frame2 = e->state_current.frame; + p->frame2time = cl.time; + p->framelerp = 0; } - - dl = &cl_dlights[0]; - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; -} - - -/* -=============== -CL_DecayLights - -=============== -*/ -void CL_DecayLights (void) -{ - int i; - dlight_t *dl; - float time; - - time = cl.time - cl.oldtime; - - dl = cl_dlights; - for (i=0 ; idie < cl.time || !dl->radius) - continue; - - dl->radius -= time*dl->decay; - if (dl->radius < 0) - dl->radius = 0; + // update transition + p->framelerp = (cl.time - p->frame2time) * 10; + p->framelerp = bound(0, p->framelerp, 1); } -} + r->model = cl.model_precache[e->state_current.modelindex]; + Mod_CheckLoaded(r->model); + r->frame = e->state_current.frame; + r->frame1 = p->frame1; + r->frame2 = p->frame2; + r->framelerp = p->framelerp; + r->frame1time = p->frame1time; + r->frame2time = p->frame2time; +} /* =============== @@ -409,278 +339,460 @@ Determines the fraction between the last two messages that the objects should be put at. =============== */ -float CL_LerpPoint (void) +static float CL_LerpPoint (void) { - float f, frac; + float f; + + // dropped packet, or start of demo + if (cl.mtime[1] < cl.mtime[0] - 0.1) + cl.mtime[1] = cl.mtime[0] - 0.1; + + cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]); + // LordHavoc: lerp in listen games as the server is being capped below the client (usually) f = cl.mtime[0] - cl.mtime[1]; - - if (!f || cl_nolerp.value || cls.timedemo || sv.active) + if (!f || cl_nolerp.integer || cls.timedemo || (sv.active && svs.maxclients == 1)) { cl.time = cl.mtime[0]; return 1; } - - if (f > 0.1) - { // dropped packet, or start of demo - cl.mtime[1] = cl.mtime[0] - 0.1; - f = 0.1; - } - frac = (cl.time - cl.mtime[1]) / f; -//Con_Printf ("frac: %f\n",frac); - if (frac < 0) + + f = (cl.time - cl.mtime[1]) / f; + return bound(0, f, 1); +} + +static void CL_RelinkStaticEntities(void) +{ + int i; + for (i = 0;i < cl_num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++) { - if (frac < -0.01) - { -SetPal(1); - cl.time = cl.mtime[1]; -// Con_Printf ("low frac\n"); - } - frac = 0; + Mod_CheckLoaded(cl_static_entities[i].render.model); + r_refdef.entities[r_refdef.numentities++] = &cl_static_entities[i].render; } - else if (frac > 1) - { - if (frac > 1.01) - { -SetPal(2); - cl.time = cl.mtime[0]; -// Con_Printf ("high frac\n"); - } - frac = 1; - } - else - SetPal(0); - - return frac; } - /* =============== CL_RelinkEntities =============== */ -void R_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent); -void CL_RelinkEntities (void) +static void CL_RelinkNetworkEntities() { - entity_t *ent; - int i, j; - float frac, f, d; - vec3_t delta; - float bobjrotate; - vec3_t oldorg; - dlight_t *dl; - byte *tempcolor; - -// determine partial update time - frac = CL_LerpPoint (); - - cl_numvisedicts = 0; - -// -// interpolate player info -// - for (i=0 ; i<3 ; i++) - cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]); + entity_t *ent; + int i, effects, temp; + float d, bobjrotate, bobjoffset, lerp; + vec3_t oldorg, neworg, delta, dlightcolor, v, v2, mins, maxs; + + bobjrotate = ANGLEMOD(100*cl.time); + if (cl_itembobheight.value) + bobjoffset = (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value; + else + bobjoffset = 0; - if (cls.demoplayback) - { - // interpolate the angles - for (j=0 ; j<3 ; j++) - { - d = cl.mviewangles[0][j] - cl.mviewangles[1][j]; - if (d > 180) - d -= 360; - else if (d < -180) - d += 360; - cl.viewangles[j] = cl.mviewangles[1][j] + frac*d; - } - } - - bobjrotate = anglemod(100*cl.time); - -// start on the entity after the world - for (i=1,ent=cl_entities+1 ; imodel) - { // empty slot - if (ent->forcelink) - R_RemoveEfrags (ent); // just became empty + // if the object isn't active in the current network frame, skip it + if (!cl_entities_active[i]) continue; - } - -// if the object wasn't included in the last packet, remove it - if (ent->msgtime != cl.mtime[0]) + if (!ent->state_current.active) { - ent->model = NULL; + cl_entities_active[i] = false; continue; } - VectorCopy (ent->origin, oldorg); + VectorCopy(ent->persistent.trail_origin, oldorg); - if (ent->forcelink) - { // the entity was not updated in the last message - // so move to the final spot - VectorCopy (ent->msg_origins[0], ent->origin); - VectorCopy (ent->msg_angles[0], ent->angles); + if (!ent->state_previous.active) + { + // only one state available + VectorCopy (ent->persistent.neworigin, neworg); + VectorCopy (ent->persistent.newangles, ent->render.angles); + VectorCopy (neworg, oldorg); } else - { // if the delta is large, assume a teleport and don't lerp - f = frac; - for (j=0 ; j<3 ; j++) + { + // if the delta is large, assume a teleport and don't lerp + VectorSubtract(ent->persistent.neworigin, ent->persistent.oldorigin, delta); + if (ent->persistent.lerpdeltatime > 0) { - delta[j] = ent->msg_origins[0][j] - ent->msg_origins[1][j]; - // LordHavoc: increased lerp tolerance from 100 to 200 - if (delta[j] > 200 || delta[j] < -200) - f = 1; // assume a teleportation, not a motion + lerp = (cl.time - ent->persistent.lerpstarttime) / ent->persistent.lerpdeltatime; + if (lerp < 1) + { + // interpolate the origin and angles + VectorMA(ent->persistent.oldorigin, lerp, delta, neworg); + VectorSubtract(ent->persistent.newangles, ent->persistent.oldangles, delta); + if (delta[0] < -180) delta[0] += 360;else if (delta[0] >= 180) delta[0] -= 360; + if (delta[1] < -180) delta[1] += 360;else if (delta[1] >= 180) delta[1] -= 360; + if (delta[2] < -180) delta[2] += 360;else if (delta[2] >= 180) delta[2] -= 360; + VectorMA(ent->persistent.oldangles, lerp, delta, ent->render.angles); + } + else + { + // no interpolation + VectorCopy (ent->persistent.neworigin, neworg); + VectorCopy (ent->persistent.newangles, ent->render.angles); + } } - - // interpolate the origin and angles - for (j=0 ; j<3 ; j++) + else { - ent->origin[j] = ent->msg_origins[1][j] + f*delta[j]; - - d = ent->msg_angles[0][j] - ent->msg_angles[1][j]; - if (d > 180) - d -= 360; - else if (d < -180) - d += 360; - ent->angles[j] = ent->msg_angles[1][j] + f*d; + // no interpolation + VectorCopy (ent->persistent.neworigin, neworg); + VectorCopy (ent->persistent.newangles, ent->render.angles); } - } - if (ent->effects & EF_BRIGHTFIELD) - R_EntityParticles (ent); - if (ent->effects & EF_MUZZLEFLASH) + VectorCopy (neworg, ent->persistent.trail_origin); + // persistent.modelindex will be updated by CL_LerpUpdate + if (ent->state_current.modelindex != ent->persistent.modelindex) + VectorCopy(neworg, oldorg); + + VectorCopy (neworg, ent->render.origin); + ent->render.flags = ent->state_current.flags; + ent->render.effects = effects = ent->state_current.effects; + if (ent->state_current.flags & RENDER_COLORMAPPED) + ent->render.colormap = ent->state_current.colormap; + else if (cl.scores == NULL || !ent->state_current.colormap) + ent->render.colormap = -1; // no special coloring + else + ent->render.colormap = cl.scores[ent->state_current.colormap - 1].colors; // color it + ent->render.skinnum = ent->state_current.skin; + ent->render.alpha = ent->state_current.alpha * (1.0f / 255.0f); // FIXME: interpolate? + ent->render.scale = ent->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate? + + // update interpolation info + CL_LerpUpdate(ent); + + // handle effects now... + dlightcolor[0] = 0; + dlightcolor[1] = 0; + dlightcolor[2] = 0; + + // LordHavoc: if the entity has no effects, don't check each + if (effects) { - vec3_t fv, rv, uv; - - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->origin[2] += 16; - AngleVectors (ent->angles, fv, rv, uv); - - VectorMA (dl->origin, 18, fv, dl->origin); - dl->radius = 200 + (rand()&31); - dl->minlight = 32; - dl->die = cl.time + 0.1; - dl->color[0] = 1.0;dl->color[1] = 1.0;dl->color[2] = 1.0; - } - if (ent->effects & EF_BRIGHTLIGHT) - { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->origin[2] += 16; - dl->radius = 400 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 1.0;dl->color[1] = 1.0;dl->color[2] = 1.0; - } - if (ent->effects & EF_DIMLIGHT) - { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 1.0;dl->color[1] = 1.0;dl->color[2] = 1.0; - } - // LordHavoc: added EF_RED and EF_BLUE - if (ent->effects & EF_RED) // red - { - if (ent->effects & EF_BLUE) // magenta + if (effects & EF_BRIGHTFIELD) + CL_EntityParticles (ent); + if (effects & EF_MUZZLEFLASH) + ent->persistent.muzzleflash = 100.0f; + if (effects & EF_DIMLIGHT) + { + dlightcolor[0] += 200.0f; + dlightcolor[1] += 200.0f; + dlightcolor[2] += 200.0f; + } + if (effects & EF_BRIGHTLIGHT) + { + dlightcolor[0] += 400.0f; + dlightcolor[1] += 400.0f; + dlightcolor[2] += 400.0f; + } + // LordHavoc: added EF_RED and EF_BLUE + if (effects & EF_RED) // red + { + dlightcolor[0] += 200.0f; + dlightcolor[1] += 20.0f; + dlightcolor[2] += 20.0f; + } + if (effects & EF_BLUE) // blue { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 0.7;dl->color[1] = 0.07;dl->color[2] = 0.7; + dlightcolor[0] += 20.0f; + dlightcolor[1] += 20.0f; + dlightcolor[2] += 200.0f; } - else // red + if (effects & EF_FLAME) { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 0.8;dl->color[1] = 0.05;dl->color[2] = 0.05; + if (ent->render.model) + { + mins[0] = neworg[0] - 16.0f; + mins[1] = neworg[1] - 16.0f; + mins[2] = neworg[2] - 16.0f; + maxs[0] = neworg[0] + 16.0f; + maxs[1] = neworg[1] + 16.0f; + maxs[2] = neworg[2] + 16.0f; + // how many flames to make + temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300); + CL_FlameCube(mins, maxs, temp); + } + d = lhrandom(200, 250); + dlightcolor[0] += d * 1.0f; + dlightcolor[1] += d * 0.7f; + dlightcolor[2] += d * 0.3f; + } + if (effects & EF_STARDUST) + { + if (ent->render.model) + { + mins[0] = neworg[0] - 16.0f; + mins[1] = neworg[1] - 16.0f; + mins[2] = neworg[2] - 16.0f; + maxs[0] = neworg[0] + 16.0f; + maxs[1] = neworg[1] + 16.0f; + maxs[2] = neworg[2] + 16.0f; + // how many particles to make + temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200); + CL_Stardust(mins, maxs, temp); + } + d = 100; + dlightcolor[0] += d * 1.0f; + dlightcolor[1] += d * 0.7f; + dlightcolor[2] += d * 0.3f; } } - else if (ent->effects & EF_BLUE) // blue + + if (ent->persistent.muzzleflash > 0) { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200 + (rand()&31); - dl->die = cl.time + 0.001; - dl->color[0] = 0.05;dl->color[1] = 0.05;dl->color[2] = 0.8; + AngleVectors (ent->render.angles, v, NULL, NULL); + + v2[0] = v[0] * 18 + neworg[0]; + v2[1] = v[1] * 18 + neworg[1]; + v2[2] = v[2] * 18 + neworg[2] + 16; + CL_TraceLine(neworg, v2, v, NULL, 0, true); + + CL_AllocDlight (NULL, v, ent->persistent.muzzleflash, 1, 1, 1, 0, 0); + ent->persistent.muzzleflash -= cl.frametime * 1000; } - if (ent->model->flags) // LordHavoc: if the model has no flags, don't check each + // LordHavoc: if the model has no flags, don't check each + if (ent->render.model && ent->render.model->flags) { - // rotate binary objects locally - if (ent->model->flags & EF_ROTATE) - ent->angles[1] = bobjrotate; - if (ent->model->flags & EF_GIB) - R_RocketTrail (oldorg, ent->origin, 2, ent); - else if (ent->model->flags & EF_ZOMGIB) - R_RocketTrail (oldorg, ent->origin, 4, ent); - else if (ent->model->flags & EF_TRACER) - R_RocketTrail (oldorg, ent->origin, 3, ent); - else if (ent->model->flags & EF_TRACER2) - R_RocketTrail (oldorg, ent->origin, 5, ent); - else if (ent->model->flags & EF_ROCKET) + if (ent->render.model->flags & EF_ROTATE) { - R_RocketTrail (oldorg, ent->origin, 0, ent); - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200; - dl->die = cl.time + 0.001; - dl->color[0] = 1.0;dl->color[1] = 0.8;dl->color[2] = 0.4; + ent->render.angles[1] = bobjrotate; + ent->render.origin[2] += bobjoffset; } - else if (ent->model->flags & EF_GRENADE) + // only do trails if present in the previous frame as well + if (ent->state_previous.active) { - if (ent->alpha == -1) // LordHavoc: Nehahra dem compatibility - R_RocketTrail (oldorg, ent->origin, 7, ent); - else - R_RocketTrail (oldorg, ent->origin, 1, ent); + if (ent->render.model->flags & EF_GIB) + CL_RocketTrail (oldorg, neworg, 2, ent); + else if (ent->render.model->flags & EF_ZOMGIB) + CL_RocketTrail (oldorg, neworg, 4, ent); + else if (ent->render.model->flags & EF_TRACER) + { + CL_RocketTrail (oldorg, neworg, 3, ent); + dlightcolor[0] += 0x10; + dlightcolor[1] += 0x40; + dlightcolor[2] += 0x10; + } + else if (ent->render.model->flags & EF_TRACER2) + { + CL_RocketTrail (oldorg, neworg, 5, ent); + dlightcolor[0] += 0x50; + dlightcolor[1] += 0x30; + dlightcolor[2] += 0x10; + } + else if (ent->render.model->flags & EF_ROCKET) + { + CL_RocketTrail (oldorg, ent->render.origin, 0, ent); + dlightcolor[0] += 200.0f; + dlightcolor[1] += 160.0f; + dlightcolor[2] += 80.0f; + } + else if (ent->render.model->flags & EF_GRENADE) + { + if (ent->render.alpha == -1) // LordHavoc: Nehahra dem compatibility (cigar smoke) + CL_RocketTrail (oldorg, neworg, 7, ent); + else + CL_RocketTrail (oldorg, neworg, 1, ent); + } + else if (ent->render.model->flags & EF_TRACER3) + { + CL_RocketTrail (oldorg, neworg, 6, ent); + dlightcolor[0] += 0x50; + dlightcolor[1] += 0x20; + dlightcolor[2] += 0x40; + } } - else if (ent->model->flags & EF_TRACER3) - R_RocketTrail (oldorg, ent->origin, 6, ent); } - if (ent->glowsize) // LordHavoc: customizable glow + // LordHavoc: customizable glow + if (ent->state_current.glowsize) { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->dark = ent->glowsize < 0; // darklight - dl->radius = ent->glowsize; - if (dl->dark) - { - if (ent->glowtrail) // LordHavoc: all darklights leave black trails - R_RocketTrail2 (oldorg, ent->origin, 0, ent); - dl->radius = -ent->glowsize; - } - else if (ent->glowtrail) // LordHavoc: customizable glow and trail - R_RocketTrail2 (oldorg, ent->origin, ent->glowcolor, ent); - dl->die = cl.time + 0.001; - tempcolor = (byte *)&d_8to24table[ent->glowcolor]; - dl->color[0] = tempcolor[0]*(1.0/255.0);dl->color[1] = tempcolor[1]*(1.0/255.0);dl->color[2] = tempcolor[2]*(1.0/255.0); + // * 4 for the expansion from 0-255 to 0-1023 range, + // / 255 to scale down byte colors + VectorMA(dlightcolor, ent->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&d_8to24table[ent->state_current.glowcolor], dlightcolor); } - else if (ent->glowtrail) // LordHavoc: customizable glow and trail - R_RocketTrail2 (oldorg, ent->origin, ent->glowcolor, ent); + // LordHavoc: customizable trail + if (ent->render.flags & RENDER_GLOWTRAIL) + CL_RocketTrail2 (oldorg, neworg, ent->state_current.glowcolor, ent); - ent->forcelink = false; + if (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) + { + VectorCopy(neworg, v); + // hack to make glowing player light shine on their gun + if (i == cl.viewentity && !chase_active.integer) + v[2] += 30; + CL_AllocDlight (NULL, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0); + } + + if (chase_active.integer) + { + if (ent->render.flags & RENDER_VIEWMODEL) + continue; + } + else + { + if (i == cl.viewentity || (ent->render.flags & RENDER_EXTERIORMODEL)) + continue; + } - if (i == cl.viewentity && !chase_active.value) + // don't show entities with no modelindex (note: this still shows + // entities which have a modelindex that resolved to a NULL model) + if (!ent->state_current.modelindex) continue; + if (effects & EF_NODRAW) + continue; + + CL_BoundingBoxForEntity(&ent->render); + if (ent->render.model && ent->render.model->name[0] == '*' && ent->render.model->type == mod_brush) + cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render; + + if (r_refdef.numentities < r_refdef.maxentities) + r_refdef.entities[r_refdef.numentities++] = &ent->render; + + if (cl_num_entities < i + 1) + cl_num_entities = i + 1; + } +} + +void CL_LerpPlayer(float frac) +{ + int i; + float d; + + if (cl.entitydatabase.numframes && cl.viewentity == cl.playerentity) + { + cl.viewentorigin[0] = cl.viewentoriginold[0] + frac * (cl.viewentoriginnew[0] - cl.viewentoriginold[0]); + cl.viewentorigin[1] = cl.viewentoriginold[1] + frac * (cl.viewentoriginnew[1] - cl.viewentoriginold[1]); + cl.viewentorigin[2] = cl.viewentoriginold[2] + frac * (cl.viewentoriginnew[2] - cl.viewentoriginold[2]); + } + else + VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin); + + cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold); + + for (i = 0;i < 3;i++) + cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]); -// LordHavoc: enabled EF_NODRAW - if (!ent->model || ent->effects & EF_NODRAW) + if (cls.demoplayback) + { + // interpolate the angles + for (i = 0;i < 3;i++) + { + d = cl.mviewangles[0][i] - cl.mviewangles[1][i]; + if (d > 180) + d -= 360; + else if (d < -180) + d += 360; + cl.viewangles[i] = cl.mviewangles[1][i] + frac * d; + } + } +} + +void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate) +{ + int i; + cl_effect_t *e; + if (!modelindex) // sanity check + return; + for (i = 0, e = cl_effects;i < cl_max_effects;i++, e++) + { + if (e->active) continue; - if (cl_numvisedicts < MAX_VISEDICTS) + e->active = true; + VectorCopy(org, e->origin); + e->modelindex = modelindex; + e->starttime = cl.time; + e->startframe = startframe; + e->endframe = startframe + framecount; + e->framerate = framerate; + + e->frame = 0; + e->frame1time = cl.time; + e->frame2time = cl.time; + break; + } +} + +static void CL_RelinkEffects() +{ + int i, intframe; + cl_effect_t *e; + entity_t *ent; + float frame; + + for (i = 0, e = cl_effects;i < cl_max_effects;i++, e++) + { + if (e->active) { - cl_visedicts[cl_numvisedicts] = ent; - cl_numvisedicts++; + frame = (cl.time - e->starttime) * e->framerate + e->startframe; + intframe = frame; + if (intframe < 0 || intframe >= e->endframe) + { + e->active = false; + memset(e, 0, sizeof(*e)); + continue; + } + + if (intframe != e->frame) + { + e->frame = intframe; + e->frame1time = e->frame2time; + e->frame2time = cl.time; + } + + // if we're drawing effects, get a new temp entity + // (NewTempEntity adds it to the render entities list for us) + if (r_draweffects.integer && (ent = CL_NewTempEntity())) + { + // interpolation stuff + ent->render.frame1 = intframe; + ent->render.frame2 = intframe + 1; + if (ent->render.frame2 >= e->endframe) + ent->render.frame2 = -1; // disappear + ent->render.framelerp = frame - intframe; + ent->render.frame1time = e->frame1time; + ent->render.frame2time = e->frame2time; + + // normal stuff + VectorCopy(e->origin, ent->render.origin); + ent->render.model = cl.model_precache[e->modelindex]; + ent->render.frame = ent->render.frame2; + ent->render.colormap = -1; // no special coloring + ent->render.scale = 1; + ent->render.alpha = 1; + + CL_BoundingBoxForEntity(&ent->render); + } } } +} + +void CL_RelinkWorld (void) +{ + if (cl_num_entities < 1) + cl_num_entities = 1; + cl_brushmodel_entities[cl_num_brushmodel_entities++] = &cl_entities[0].render; + CL_BoundingBoxForEntity(&cl_entities[0].render); +} + +void CL_RelinkEntities (void) +{ + float frac; + + // fraction from previous network update to current + frac = CL_LerpPoint(); + CL_ClearTempEntities(); + CL_DecayLights(); + CL_RelinkWorld(); + CL_RelinkBeams(); + CL_RelinkStaticEntities(); + CL_RelinkNetworkEntities(); + CL_RelinkEffects(); + CL_MoveParticles(); + + CL_LerpPlayer(frac); } @@ -693,11 +805,12 @@ Read all incoming data from the server */ int CL_ReadFromServer (void) { - int ret; + int ret, netshown; cl.oldtime = cl.time; - cl.time += host_frametime; - + cl.time += cl.frametime; + + netshown = false; do { ret = CL_GetMessage (); @@ -705,16 +818,30 @@ int CL_ReadFromServer (void) Host_Error ("CL_ReadFromServer: lost server connection"); if (!ret) break; - + cl.last_received_message = realtime; + + if (cl_shownet.integer) + netshown = true; + CL_ParseServerMessage (); - } while (ret && cls.state == ca_connected); - - if (cl_shownet.value) + } + while (ret && cls.state == ca_connected); + + if (netshown) Con_Printf ("\n"); - CL_RelinkEntities (); - CL_UpdateTEnts (); + r_refdef.numentities = 0; + cl_num_entities = 0; + cl_num_brushmodel_entities = 0; + + if (cls.state == ca_connected && cls.signon == SIGNONS) + { + CL_RelinkEntities (); + + // run cgame code (which can add more entities) + CL_CGVM_Frame(); + } // // bring the links up to date @@ -738,28 +865,60 @@ void CL_SendCmd (void) { // get basic movement from keyboard CL_BaseMove (&cmd); - + + IN_PreMove(); // OS independent code + // allow mice or other external controllers to add to the move IN_Move (&cmd); - + + IN_PostMove(); // OS independent code + // send the unreliable message CL_SendMove (&cmd); - } +#ifndef NOROUTINGFIX + else if (cls.signon == 0 && !cls.demoplayback) + { + // LordHavoc: fix for NAT routing of netquake: + // bounce back a clc_nop message to the newly allocated server port, + // to establish a routing connection for incoming frames, + // the server waits for this before sending anything + if (realtime > cl.sendnoptime) + { + cl.sendnoptime = realtime + 3; + Con_DPrintf("sending clc_nop to get server's attention\n"); + { + sizebuf_t buf; + qbyte data[128]; + buf.maxsize = 128; + buf.cursize = 0; + buf.data = data; + MSG_WriteByte(&buf, clc_nop); + if (NET_SendUnreliableMessage (cls.netcon, &buf) == -1) + { + Con_Printf ("CL_SendCmd: lost server connection\n"); + CL_Disconnect (); + } + } + } + } +#endif if (cls.demoplayback) { SZ_Clear (&cls.message); return; } - + // send the reliable message if (!cls.message.cursize) return; // no message at all - + if (!NET_CanSendMessage (cls.netcon)) { Con_DPrintf ("CL_WriteToServer: can't send\n"); + if (developer.integer) + SZ_HexDumpToConsole(&cls.message); return; } @@ -770,7 +929,7 @@ void CL_SendCmd (void) } // LordHavoc: pausedemo command -void CL_PauseDemo_f (void) +static void CL_PauseDemo_f (void) { cls.demopaused = !cls.demopaused; if (cls.demopaused) @@ -785,7 +944,7 @@ CL_PModel_f LordHavoc: Intended for Nehahra, I personally think this is dumb, but Mindcrime won't listen. ====================== */ -void CL_PModel_f (void) +static void CL_PModel_f (void) { int i; eval_t *val; @@ -799,7 +958,7 @@ void CL_PModel_f (void) if (cmd_source == src_command) { - if (cl_pmodel.value == i) + if (cl_pmodel.integer == i) return; Cvar_SetValue ("_cl_pmodel", i); if (cls.state == ca_connected) @@ -808,7 +967,7 @@ void CL_PModel_f (void) } host_client->pmodel = i; - if (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)) + if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))) val->_float = i; } @@ -817,8 +976,7 @@ void CL_PModel_f (void) CL_Fog_f ====================== */ -extern float fog_density, fog_red, fog_green, fog_blue; -void CL_Fog_f (void) +static void CL_Fog_f (void) { if (Cmd_Argc () == 1) { @@ -831,26 +989,37 @@ void CL_Fog_f (void) fog_blue = atof(Cmd_Argv(4)); } -cvar_t demo_nehahra = {"demo_nehahra", "0"}; - /* ================= CL_Init ================= */ void CL_Init (void) -{ - SZ_Alloc (&cls.message, 1024); +{ + cl_scores_mempool = Mem_AllocPool("client player info"); + cl_entities_mempool = Mem_AllocPool("client entities"); + cl_refdef_mempool = Mem_AllocPool("refdef"); + + memset(&r_refdef, 0, sizeof(r_refdef)); + // max entities sent to renderer per frame + r_refdef.maxentities = MAX_EDICTS + 256 + 512; + r_refdef.entities = Mem_Alloc(cl_refdef_mempool, sizeof(entity_render_t *) * r_refdef.maxentities); + // 256k drawqueue buffer + r_refdef.maxdrawqueuesize = 256 * 1024; + r_refdef.drawqueue = Mem_Alloc(cl_refdef_mempool, r_refdef.maxdrawqueuesize); + + SZ_Alloc (&cls.message, 1024, "cls.message"); CL_InitInput (); CL_InitTEnts (); - + // // register our commands // Cvar_RegisterVariable (&cl_name); Cvar_RegisterVariable (&cl_color); - Cvar_RegisterVariable (&cl_pmodel); + if (gamemode == GAME_NEHAHRA) + Cvar_RegisterVariable (&cl_pmodel); Cvar_RegisterVariable (&cl_upspeed); Cvar_RegisterVariable (&cl_forwardspeed); Cvar_RegisterVariable (&cl_backspeed); @@ -864,15 +1033,18 @@ void CL_Init (void) Cvar_RegisterVariable (&lookspring); Cvar_RegisterVariable (&lookstrafe); Cvar_RegisterVariable (&sensitivity); + Cvar_RegisterVariable (&freelook); Cvar_RegisterVariable (&m_pitch); Cvar_RegisterVariable (&m_yaw); Cvar_RegisterVariable (&m_forward); Cvar_RegisterVariable (&m_side); -// Cvar_RegisterVariable (&cl_autofire); - + Cvar_RegisterVariable (&cl_itembobspeed); + Cvar_RegisterVariable (&cl_itembobheight); + Cmd_AddCommand ("entities", CL_PrintEntities_f); + Cmd_AddCommand ("bitprofile", CL_BitProfile_f); Cmd_AddCommand ("disconnect", CL_Disconnect_f); Cmd_AddCommand ("record", CL_Record_f); Cmd_AddCommand ("stop", CL_Stop_f); @@ -883,11 +1055,18 @@ void CL_Init (void) // LordHavoc: added pausedemo Cmd_AddCommand ("pausedemo", CL_PauseDemo_f); - // LordHavoc: added pmodel command (like name, etc, only intended for Nehahra) - Cmd_AddCommand ("pmodel", CL_PModel_f); - // LordHavoc: added demo_nehahra cvar - Cvar_RegisterVariable (&demo_nehahra); - if (nehahra) - Cvar_SetValue("demo_nehahra", 1); + if (gamemode == GAME_NEHAHRA) + Cmd_AddCommand ("pmodel", CL_PModel_f); + + Cvar_RegisterVariable(&r_draweffects); + Cvar_RegisterVariable(&cl_explosions); + Cvar_RegisterVariable(&cl_stainmaps); + + CL_Parse_Init(); + CL_Particles_Init(); + CL_Screen_Init(); + CL_CGVM_Init(); + + CL_Video_Init(); }