X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=11155759efe41e82f4dddf51edca1791bf41101b;hb=9937a055e2478c1089fc97c0b8417c83ca39b211;hp=7a6623a102212c0725c05a2058d0ec3aa341b52d;hpb=e4b3858e7aca0ead91be1d8f675db084d025abad;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index 7a6623a1..11155759 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. @@ -25,34 +25,59 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // 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 cl_draweffects = {0, "cl_draweffects", "1"}; + +mempool_t *cl_scores_mempool; +mempool_t *cl_refdef_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]; +typedef struct effect_s +{ + int active; + vec3_t origin; + float starttime; + float framerate; + int modelindex; + int startframe; + int endframe; + // these are for interpolation + int frame; + double frame1time; + double frame2time; +} +cl_effect_t; + +#define MAX_EFFECTS 256 + +static cl_effect_t cl_effect[MAX_EFFECTS]; + /* ===================== @@ -67,35 +92,72 @@ void CL_ClearState (void) if (!sv.active) Host_ClearMemory (); + Mem_EmptyPool(cl_scores_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)); +// clear other arrays + memset(cl_entities, 0, sizeof(cl_entities)); + memset(cl_lightstyle, 0, sizeof(cl_lightstyle)); + memset(cl_temp_entities, 0, sizeof(cl_temp_entities)); + memset(cl_beams, 0, sizeof(cl_beams)); + memset(cl_dlights, 0, sizeof(cl_dlights)); + memset(cl_effect, 0, sizeof(cl_effect)); + 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++) { - 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 ; ipersistent; + r = &e->render; + + if (p->modelindex != e->state_current.modelindex) + { + // 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; + } + else if (p->frame2 != e->state_current.frame) + { + // 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; + } + else + { + // 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; } /* @@ -108,13 +170,20 @@ This is also called on Host_Error, so it shouldn't cause any errors */ void CL_Disconnect (void) { + if (cls.state == ca_dedicated) + return; + // stop sounds (especially looping!) S_StopAllSounds (true); - -// bring the console down and fade the colors back to normal -// SCR_BringDownConsole (); -// if running a local server, shut it down + // clear contents blends + cl.cshifts[0].percent = 0; + cl.cshifts[1].percent = 0; + cl.cshifts[2].percent = 0; + cl.cshifts[3].percent = 0; + + cl.worldmodel = NULL; + if (cls.demoplayback) CL_StopPlayback (); else if (cls.state == ca_connected) @@ -128,11 +197,12 @@ void CL_Disconnect (void) NET_SendUnreliableMessage (cls.netcon, &cls.message); SZ_Clear (&cls.message); NET_Close (cls.netcon); - - cls.state = ca_disconnected; + cls.state = ca_disconnected; // prevent this code from executing again during Host_ShutdownServer + // if running a local server, shut it down if (sv.active) Host_ShutdownServer(false); } + cls.state = ca_disconnected; cls.demoplayback = cls.timedemo = false; cls.signon = 0; @@ -169,478 +239,565 @@ void CL_EstablishConnection (char *host) if (!cls.netcon) Host_Error ("CL_Connect: connect failed\n"); Con_DPrintf ("CL_EstablishConnection: connected to %s\n", host); - + cls.demonum = -1; // not in the demo loop now cls.state = ca_connected; cls.signon = 0; // need all the signon messages before playing + + CL_ClearState (); } /* -===================== -CL_SignonReply - -An svc_signonnum has been received, perform a client side setup -===================== +============== +CL_PrintEntities_f +============== */ -void CL_SignonReply (void) +static void CL_PrintEntities_f (void) { - char str[8192]; - -Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); + entity_t *ent; + int i, j; + char name[32]; - switch (cls.signon) + for (i = 0, ent = cl_entities;i < MAX_EDICTS /*cl.num_entities*/;i++, ent++) { - case 1: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "prespawn"); - break; - - case 2: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string)); - - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("color %i %i\n", ((int)cl_color.value)>>4, ((int)cl_color.value)&15)); - - if (cl_pmodel.value) + if (!ent->state_current.active) + continue; + if (!ent->render.model) + continue; + + Con_Printf ("%3i:", i); + if (!ent->render.model) { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("pmodel %f\n", cl_pmodel.value)); + Con_Printf ("EMPTY\n"); + 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 - break; + strncpy(name, ent->render.model->name, 25); + name[25] = 0; + for (j = strlen(name);j < 25;j++) + name[j] = ' '; + Con_Printf ("%s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", 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 +=============== +CL_LerpPoint -Called to play the next demo in the demo loop -===================== +Determines the fraction between the last two messages that the objects +should be put at. +=============== */ -void CL_NextDemo (void) +static float CL_LerpPoint (void) { - char str[1024]; + float f; - if (cls.demonum == -1) - return; // don't play demos + // dropped packet, or start of demo + if (cl.mtime[1] < cl.mtime[0] - 0.1) + cl.mtime[1] = cl.mtime[0] - 0.1; - SCR_BeginLoadingPlaque (); + cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]); - if (!cls.demos[cls.demonum][0] || cls.demonum == MAX_DEMOS) + // 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.integer || cls.timedemo || (sv.active && svs.maxclients == 1)) { - cls.demonum = 0; - if (!cls.demos[cls.demonum][0]) - { - Con_Printf ("No demos listed with startdemos\n"); - cls.demonum = -1; - return; - } + cl.time = cl.mtime[0]; + return 1; } - sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]); - Cbuf_InsertText (str); - cls.demonum++; + f = (cl.time - cl.mtime[1]) / f; + return bound(0, f, 1); } -/* -============== -CL_PrintEntities_f -============== -*/ -void CL_PrintEntities_f (void) +static void CL_RelinkStaticEntities(void) { - entity_t *ent; - int i; - - for (i=0,ent=cl_entities ; imodel) - { - Con_Printf ("EMPTY\n"); - continue; - } - 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]); + Mod_CheckLoaded(cl_static_entities[i].render.model); + r_refdef.entities[r_refdef.numentities++] = &cl_static_entities[i].render; } } - /* =============== -CL_AllocDlight - +CL_RelinkEntities =============== */ -dlight_t *CL_AllocDlight (int key) +static void CL_RelinkNetworkEntities() { - int i; - dlight_t *dl; + entity_t *ent; + int i, glowcolor, effects; + float f, d, bobjrotate, bobjoffset, dlightradius, glowsize, lerp; + vec3_t oldorg, neworg, delta, dlightcolor; + + 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; -// first look for an exact key match - if (key) +// start on the entity after the world + for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS /*cl.num_entities*/;i++, ent++) { - dl = cl_dlights; - for (i=0 ; istate_current.active) + continue; + + VectorCopy(ent->persistent.trail_origin, oldorg); + + if (!ent->state_previous.active) { - if (dl->key == key) + // only one state available + lerp = 1; + VectorCopy (ent->state_current.origin, oldorg); // skip trails + VectorCopy (ent->state_current.origin, neworg); + VectorCopy (ent->state_current.angles, ent->render.angles); + + /* + // monster interpolation + ent->persistent.steplerptime = 0; + VectorCopy(ent->state_current.origin, ent->persistent.stepoldorigin); + VectorCopy(ent->state_current.angles, ent->persistent.stepoldangles); + VectorCopy(ent->state_current.origin, ent->persistent.steporigin); + VectorCopy(ent->state_current.angles, ent->persistent.stepangles); + */ + } + /* + else if ((ent->state_current.flags & ent->state_previous.flags) & ENTFLAG_STEP) + { + if (ent->state_current.origin[0] != ent->persistent.steporigin[0] + || ent->state_current.origin[1] != ent->persistent.steporigin[1] + || ent->state_current.origin[2] != ent->persistent.steporigin[2] + || ent->state_current.angles[0] != ent->persistent.stepangles[0] + || ent->state_current.angles[1] != ent->persistent.stepangles[1] + || ent->state_current.angles[2] != ent->persistent.stepangles[2]) + { + // update lerp positions + ent->clientpersistent.steplerptime = sv.time; + VectorCopy(ent->steporigin, ent->stepoldorigin); + VectorCopy(ent->stepangles, ent->stepoldangles); + VectorCopy(ent->v.origin, ent->steporigin); + VectorCopy(ent->v.angles, ent->stepangles); + } + lerp = (cl.time - ent->persistent.steplerptime) * 10.0; + if (lerp < 1) { - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; + // origin + VectorSubtract(ent->persistent.steporigin, ent->persistent.stepoldorigin, delta); + VectorMA(ent->persistent.stepoldorigin, lerp, delta, neworg); + + // angles + VectorSubtract(ent->persistent.stepangles, ent->persistent.stepoldangles, delta); + // choose shortest rotate (to avoid 'spin around' situations) + 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->stepoldangles, lerp, delta, ent->render.angles); + } + else + { + VectorCopy(ent->persistent.steporigin, neworg); + VectorCopy(ent->persistent.stepangles, ent->render.angles); } } - } - -// then look for anything else - dl = cl_dlights; - for (i=0 ; idie < cl.time) + */ + else { - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; + /* + // monster interpolation + ent->persistent.steplerptime = 0; + VectorCopy(ent->state_current.origin, ent->persistent.stepoldorigin); + VectorCopy(ent->state_current.angles, ent->persistent.stepoldangles); + VectorCopy(ent->state_current.origin, ent->persistent.steporigin); + VectorCopy(ent->state_current.angles, ent->persistent.stepangles); + */ + + // if the delta is large, assume a teleport and don't lerp + VectorSubtract(ent->state_current.origin, ent->state_previous.origin, delta); + // LordHavoc: increased tolerance from 100 to 200, and now to 1000 + if ((sv.active && svs.maxclients == 1 && !(ent->state_current.flags & RENDER_STEP)) || cls.timedemo || DotProduct(delta, delta) > 1000*1000 || cl_nolerp.integer) + lerp = 1; + else + { + f = ent->state_current.time - ent->state_previous.time; + if (f > 0) + lerp = (cl.time - ent->state_previous.time) / f; + else + lerp = 1; + } + if (lerp >= 1) + { + // no interpolation + VectorCopy (ent->state_current.origin, neworg); + VectorCopy (ent->state_current.angles, ent->render.angles); + } + else + { + // interpolate the origin and angles + VectorMA(ent->state_previous.origin, lerp, delta, neworg); + VectorSubtract(ent->state_current.angles, ent->state_previous.angles, 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->state_previous.angles, lerp, delta, ent->render.angles); + } } - } - - dl = &cl_dlights[0]; - memset (dl, 0, sizeof(*dl)); - dl->key = key; - return dl; -} + 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); -/* -=============== -CL_DecayLights - -=============== -*/ -void CL_DecayLights (void) -{ - int i; - dlight_t *dl; - float time; - - time = cl.time - cl.oldtime; - - c_dlights = 0; - dl = cl_dlights; - for (i=0 ; idie < cl.time || !dl->radius) - continue; - - c_dlights++; // count every dlight in use + VectorCopy (neworg, ent->render.origin); + ent->render.flags = ent->state_current.flags; + ent->render.effects = effects = ent->state_current.effects; + 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... + dlightradius = 0; + dlightcolor[0] = 0; + dlightcolor[1] = 0; + dlightcolor[2] = 0; + + // LordHavoc: if the entity has no effects, don't check each + if (effects) + { + if (effects & EF_BRIGHTFIELD) + CL_EntityParticles (ent); + if (effects & EF_MUZZLEFLASH) + { + vec3_t v, v2; - dl->radius -= time*dl->decay; - if (dl->radius < 0) - dl->radius = 0; - } -} + 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; + TraceLine(neworg, v2, v, NULL, 0, true); -/* -=============== -CL_LerpPoint + CL_AllocDlight (NULL, v, 100, 1, 1, 1, 0, 0); + } + 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 + { + dlightcolor[0] += 20.0f; + dlightcolor[1] += 20.0f; + dlightcolor[2] += 200.0f; + } + if (effects & EF_FLAME) + { + if (ent->render.model) + { + vec3_t mins, maxs; + int temp; + /* + if (ent->render.angles[0] || ent->render.angles[2]) + { + VectorMA(neworg, 0.25f, ent->render.model->rotatedmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->rotatedmaxs, maxs); + } + else if (ent->render.angles[1]) + { + VectorMA(neworg, 0.25f, ent->render.model->yawmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->yawmaxs, maxs); + } + else + { + VectorMA(neworg, 0.25f, ent->render.model->normalmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->normalmaxs, maxs); + } + */ + 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) + { + vec3_t mins, maxs; + int temp; + /* + if (ent->render.angles[0] || ent->render.angles[2]) + { + VectorMA(neworg, 0.25f, ent->render.model->rotatedmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->rotatedmaxs, maxs); + } + else if (ent->render.angles[1]) + { + VectorMA(neworg, 0.25f, ent->render.model->yawmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->yawmaxs, maxs); + } + else + { + VectorMA(neworg, 0.25f, ent->render.model->normalmins, mins); + VectorMA(neworg, 0.25f, ent->render.model->normalmaxs, maxs); + } + */ + 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; + } + } -Determines the fraction between the last two messages that the objects -should be put at. -=============== -*/ -float CL_LerpPoint (void) -{ - float f, frac; + // LordHavoc: if the model has no flags, don't check each + if (ent->render.model && ent->render.model->flags) + { + if (ent->render.model->flags & EF_ROTATE) + { + ent->render.angles[1] = bobjrotate; + ent->render.origin[2] += bobjoffset; + } + // only do trails if present in the previous frame as well + if (ent->state_previous.active) + { + 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); + else if (ent->render.model->flags & EF_TRACER2) + CL_RocketTrail (oldorg, neworg, 5, ent); + 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 + 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); + } + } + // LordHavoc: customizable glow + glowsize = ent->state_current.glowsize; // FIXME: interpolate? + glowcolor = ent->state_current.glowcolor; + if (glowsize) + { + qbyte *tempcolor = (qbyte *)&d_8to24table[glowcolor]; + // * 4 for the expansion from 0-255 to 0-1023 range, + // / 255 to scale down byte colors + glowsize *= (4.0f / 255.0f); + VectorMA(dlightcolor, glowsize, tempcolor, dlightcolor); + } + // LordHavoc: customizable trail + if (ent->render.flags & RENDER_GLOWTRAIL) + CL_RocketTrail2 (oldorg, neworg, glowcolor, ent); - f = cl.mtime[0] - cl.mtime[1]; + if (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) + { + vec3_t vec; + VectorCopy(neworg, vec); + // hack to make glowing player light shine on their gun + if (i == cl.viewentity && !chase_active.integer) + vec[2] += 30; + CL_AllocDlight (/*&ent->render*/ NULL, vec, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0); + } - // LordHavoc: lerp in listen games as the server is being capped below the client (usually) - if (!f || cl_nolerp.value || 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) - { - if (frac < -0.01) + if (chase_active.integer) { - cl.time = cl.mtime[1]; -// Con_Printf ("low frac\n"); + if (ent->render.flags & RENDER_VIEWMODEL) + continue; } - frac = 0; - } - else if (frac > 1) - { - if (frac > 1.01) + else { - cl.time = cl.mtime[0]; -// Con_Printf ("high frac\n"); + if (i == cl.viewentity || (ent->render.flags & RENDER_EXTERIORMODEL)) + continue; } - frac = 1; + + if (ent->render.model == NULL) + continue; + if (effects & EF_NODRAW) + continue; + if (r_refdef.numentities < MAX_VISEDICTS) + r_refdef.entities[r_refdef.numentities++] = &ent->render; } - - return frac; } - -/* -=============== -CL_RelinkEntities -=============== -*/ -void R_RocketTrail2 (vec3_t start, vec3_t end, int color, entity_t *ent); -void CL_RelinkEntities (void) +void CL_LerpPlayer(float frac) { - 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 (); + int i; + float d; - cl_numvisedicts = 0; + if (cl.entitydatabase.numframes) + { + 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); -// -// interpolate player info -// - for (i=0 ; i<3 ; i++) + 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]); if (cls.demoplayback) { - // interpolate the angles - for (j=0 ; j<3 ; j++) + // interpolate the angles + for (i = 0;i < 3;i++) { - d = cl.mviewangles[0][j] - cl.mviewangles[1][j]; + d = cl.mviewangles[0][i] - cl.mviewangles[1][i]; if (d > 180) d -= 360; else if (d < -180) d += 360; - cl.viewangles[j] = cl.mviewangles[1][j] + frac*d; + cl.viewangles[i] = cl.mviewangles[1][i] + 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 - continue; - } +} -// if the object wasn't included in the last packet, remove it - if (ent->msgtime != cl.mtime[0]) - { - ent->model = NULL; - // LordHavoc: free on the same frame, not the next -// if (ent->forcelink) -// R_RemoveEfrags (ent); // just became empty +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_effect;i < MAX_EFFECTS;i++, e++) + { + if (e->active) continue; - } - - VectorCopy (ent->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); - } - else - { // if the delta is large, assume a teleport and don't lerp - f = frac; - for (j=0 ; j<3 ; j++) - { - 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 - } + 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; + } +} - // interpolate the origin and angles - for (j=0 ; j<3 ; j++) - { - 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; - } - - } +static void CL_RelinkEffects() +{ + int i, intframe; + cl_effect_t *e; + entity_t *vis; + float frame; - if (ent->effects & EF_BRIGHTFIELD) - R_EntityParticles (ent); - if (ent->effects & EF_MUZZLEFLASH) - { - vec3_t fv; - - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->origin[2] += 16; - AngleVectors (ent->angles, fv, NULL, NULL); - - VectorMA (dl->origin, 18, fv, dl->origin); - dl->radius = 100 + (rand()&31); - 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 - { - 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; - } - else // red - { - 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; - } - } - else if (ent->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.05;dl->color[1] = 0.05;dl->color[2] = 0.8; - } - else if (ent->effects & EF_FLAME) + for (i = 0, e = cl_effect;i < MAX_EFFECTS;i++, e++) + { + if (e->active) { - if (ent->model) + frame = (cl.time - e->starttime) * e->framerate + e->startframe; + intframe = frame; + if (intframe < 0 || intframe >= e->endframe) { - vec3_t mins, maxs; - int temp; - VectorAdd(ent->origin, ent->model->mins, mins); - VectorAdd(ent->origin, ent->model->maxs, maxs); - // how many flames to make - temp = (int) (cl.time * 30) - (int) (cl.oldtime * 30); - R_FlameCube(mins, maxs, temp); + e->active = false; + memset(e, 0, sizeof(*e)); + continue; } - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = 200 + (rand()&31); - dl->die = cl.time + 0.25; - dl->decay = dl->radius * 4; - dl->color[0] = 1.0;dl->color[1] = 0.7;dl->color[2] = 0.3; - } - if (ent->model->flags) // LordHavoc: if the model has no flags, don't check each - { - // 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 (intframe != e->frame) { - 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; + e->frame = intframe; + e->frame1time = e->frame2time; + e->frame2time = cl.time; } - else if (ent->model->flags & EF_GRENADE) + + if ((vis = CL_NewTempEntity())) { - if (ent->alpha == -1) // LordHavoc: Nehahra dem compatibility - R_RocketTrail (oldorg, ent->origin, 7, ent); - else - R_RocketTrail (oldorg, ent->origin, 1, ent); + // interpolation stuff + vis->render.frame1 = intframe; + vis->render.frame2 = intframe + 1; + if (vis->render.frame2 >= e->endframe) + vis->render.frame2 = -1; // disappear + vis->render.framelerp = frame - intframe; + vis->render.frame1time = e->frame1time; + vis->render.frame2time = e->frame2time; + + // normal stuff + VectorCopy(e->origin, vis->render.origin); + vis->render.model = cl.model_precache[e->modelindex]; + vis->render.frame = vis->render.frame2; + vis->render.colormap = -1; // no special coloring + vis->render.scale = 1; + vis->render.alpha = 1; } - else if (ent->model->flags & EF_TRACER3) - R_RocketTrail (oldorg, ent->origin, 6, ent); - } - if (ent->glowsize) // LordHavoc: customizable glow - { - dl = CL_AllocDlight (i); - VectorCopy (ent->origin, dl->origin); - dl->radius = ent->glowsize; - 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); } - if (ent->glowtrail) // LordHavoc: customizable glow and trail - R_RocketTrail2 (oldorg, ent->origin, ent->glowcolor, ent); + } +} - ent->forcelink = false; +void CL_RelinkEntities (void) +{ + float frac; - if (i == cl.viewentity && !chase_active.value) - continue; + // fraction from previous network update to current + frac = CL_LerpPoint (); -// LordHavoc: enabled EF_NODRAW - if (!ent->model || ent->effects & EF_NODRAW) - continue; - if (cl_numvisedicts < MAX_VISEDICTS) - cl_visedicts[cl_numvisedicts++] = ent; - } + CL_DecayLights (); + CL_RelinkStaticEntities(); + CL_RelinkNetworkEntities(); + TraceLine_ScanForBModels(); + CL_RelinkEffects(); + CL_MoveParticles(); + CL_UpdateTEnts(); + CL_LerpPlayer(frac); } @@ -653,11 +810,12 @@ Read all incoming data from the server */ int CL_ReadFromServer (void) { - int ret; + int ret, netshown; cl.oldtime = cl.time; cl.time += cl.frametime; - + + netshown = false; do { ret = CL_GetMessage (); @@ -665,17 +823,27 @@ 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 (); - CL_DoEffects (); + r_refdef.numentities = 0; + if (cls.state == ca_connected && cl.worldmodel) + { + CL_RelinkEntities (); + + // run cgame code (which can add more entities) + CL_CGVM_Frame(); + } // // bring the links up to date @@ -699,24 +867,43 @@ 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 + { + // 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) + { + Con_DPrintf("sending clc_nop to get server's attention\n"); + cl.sendnoptime = realtime + 3; + MSG_WriteByte(&cls.message, clc_nop); + } + } +#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"); @@ -730,7 +917,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) @@ -745,7 +932,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; @@ -759,7 +946,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) @@ -777,7 +964,7 @@ void CL_PModel_f (void) CL_Fog_f ====================== */ -void CL_Fog_f (void) +static void CL_Fog_f (void) { if (Cmd_Argc () == 1) { @@ -790,26 +977,31 @@ 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_refdef_mempool = Mem_AllocPool("refdef"); + memset(&r_refdef, 0, sizeof(r_refdef)); + r_refdef.entities = Mem_Alloc(cl_refdef_mempool, sizeof(entity_render_t *) * MAX_VISEDICTS); + + 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); @@ -823,15 +1015,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); @@ -842,11 +1037,13 @@ 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(&cl_draweffects); + + CL_Parse_Init(); + CL_Particles_Init(); + CL_Screen_Init(); + CL_CGVM_Init(); +}