X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_main.c;h=fa5356618b2e699b0c5aa9a01633ac2033109a6e;hp=c5caa7975899cf9eb02d999090067a988216b928;hb=fab6eb344365652bd53d03faa1ea43e14fbe1d7f;hpb=8b554980f64dffdba3e87209cdc5ab49c4741eca diff --git a/cl_main.c b/cl_main.c index c5caa797..fa535661 100644 --- a/cl_main.c +++ b/cl_main.c @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cl_collision.h" #include "cl_video.h" #include "image.h" +#include "r_shadow.h" // we need to declare some mouse variables here, because the menu system // references them even when on a unix system. @@ -30,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. cvar_t cl_shownet = {0, "cl_shownet","0"}; cvar_t cl_nolerp = {0, "cl_nolerp", "0"}; -cvar_t cl_itembobheight = {0, "cl_itembobheight", "8"}; +cvar_t cl_itembobheight = {0, "cl_itembobheight", "0"}; // try 8 cvar_t cl_itembobspeed = {0, "cl_itembobspeed", "0.5"}; cvar_t lookspring = {CVAR_SAVE, "lookspring","0"}; @@ -53,7 +54,7 @@ cvar_t cl_explosions_size_end = {CVAR_SAVE, "cl_explosions_size_end", "128"}; cvar_t cl_explosions_lifetime = {CVAR_SAVE, "cl_explosions_lifetime", "0.5"}; cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"}; -cvar_t cl_stainmapsclearonload = {CVAR_SAVE, "cl_stainmapsclearonload", "0"}; +cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1"}; cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1"}; cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1"}; @@ -63,8 +64,14 @@ cvar_t cl_noplayershadow = {CVAR_SAVE, "cl_noplayershadow", "0"}; cvar_t cl_prydoncursor = {0, "cl_prydoncursor", "0"}; -mempool_t *cl_refdef_mempool; -mempool_t *cl_entities_mempool; +cvar_t cl_deathnoviewmodel = {0, "cl_deathnoviewmodel", "1"}; + +vec3_t cl_playerstandmins; +vec3_t cl_playerstandmaxs; +vec3_t cl_playercrouchmins; +vec3_t cl_playercrouchmaxs; + +mempool_t *cl_mempool; client_static_t cls; client_state_t cl; @@ -77,22 +84,27 @@ int cl_max_beams; int cl_max_dlights; int cl_max_lightstyle; int cl_max_brushmodel_entities; +int cl_activedlights; entity_t *cl_entities; -qbyte *cl_entities_active; +unsigned char *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_brushmodel_entities; int cl_num_entities; int cl_num_static_entities; int cl_num_temp_entities; int cl_num_brushmodel_entities; +// keep track of quake entities because they need to be killed if they get stale +extern int cl_lastquakeentity; +extern unsigned char cl_isquakeentity[MAX_EDICTS]; + /* ===================== CL_ClearState @@ -103,16 +115,26 @@ void CL_ClearState(void) { int i; + if (cl_entities) Mem_Free(cl_entities);cl_entities = NULL; + if (cl_entities_active) Mem_Free(cl_entities_active);cl_entities_active = NULL; + if (cl_static_entities) Mem_Free(cl_static_entities);cl_static_entities = NULL; + if (cl_temp_entities) Mem_Free(cl_temp_entities);cl_temp_entities = NULL; + if (cl_effects) Mem_Free(cl_effects);cl_effects = NULL; + if (cl_beams) Mem_Free(cl_beams);cl_beams = NULL; + if (cl_dlights) Mem_Free(cl_dlights);cl_dlights = NULL; + if (cl_lightstyle) Mem_Free(cl_lightstyle);cl_lightstyle = NULL; + if (cl_brushmodel_entities) Mem_Free(cl_brushmodel_entities);cl_brushmodel_entities = NULL; + if (cl.entitydatabase) EntityFrame_FreeDatabase(cl.entitydatabase);cl.entitydatabase = NULL; + if (cl.entitydatabase4) EntityFrame4_FreeDatabase(cl.entitydatabase4);cl.entitydatabase4 = NULL; + if (cl.scores) Mem_Free(cl.scores);cl.scores = NULL; + if (!sv.active) Host_ClearMemory (); - // note: this also gets rid of the entity database - Mem_EmptyPool(cl_entities_mempool); - // wipe the entire cl structure memset (&cl, 0, sizeof(cl)); // reset the view zoom interpolation - cl.viewzoomold = cl.viewzoomnew = 1; + cl.mviewzoom[0] = cl.mviewzoom[1] = 1; SZ_Clear (&cls.message); @@ -122,7 +144,7 @@ void CL_ClearState(void) cl_num_brushmodel_entities = 0; // tweak these if the game runs out - cl_max_entities = MAX_EDICTS; + cl_max_entities = 256; cl_max_static_entities = 256; cl_max_temp_entities = 512; cl_max_effects = 256; @@ -130,20 +152,20 @@ void CL_ClearState(void) cl_max_dlights = MAX_DLIGHTS; cl_max_lightstyle = MAX_LIGHTSTYLES; cl_max_brushmodel_entities = MAX_EDICTS; + cl_activedlights = 0; - 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_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t)); + cl_entities_active = (unsigned char *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(unsigned char)); + cl_static_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_static_entities * sizeof(entity_t)); + cl_temp_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_temp_entities * sizeof(entity_t)); + cl_effects = (cl_effect_t *)Mem_Alloc(cl_mempool, cl_max_effects * sizeof(cl_effect_t)); + cl_beams = (beam_t *)Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t)); + cl_dlights = (dlight_t *)Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t)); + cl_lightstyle = (lightstyle_t *)Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t)); + cl_brushmodel_entities = (int *)Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(int)); - CL_Screen_NewMap(); - - CL_Particles_Clear(); + cl_lastquakeentity = 0; + memset(cl_isquakeentity, 0, sizeof(cl_isquakeentity)); // LordHavoc: have to set up the baseline info for alpha and other stuff for (i = 0;i < cl_max_entities;i++) @@ -153,9 +175,51 @@ void CL_ClearState(void) cl_entities[i].state_current = defaultstate; } + if (gamemode == GAME_NEXUIZ) + { + VectorSet(cl_playerstandmins, -16, -16, -24); + VectorSet(cl_playerstandmaxs, 16, 16, 45); + VectorSet(cl_playercrouchmins, -16, -16, -24); + VectorSet(cl_playercrouchmaxs, 16, 16, 25); + } + else + { + VectorSet(cl_playerstandmins, -16, -16, -24); + VectorSet(cl_playerstandmaxs, 16, 16, 24); + VectorSet(cl_playercrouchmins, -16, -16, -24); + VectorSet(cl_playercrouchmaxs, 16, 16, 24); + } + + CL_Screen_NewMap(); + CL_Particles_Clear(); CL_CGVM_Clear(); } +void CL_ExpandEntities(int num) +{ + int i, oldmaxentities; + entity_t *oldentities; + if (num >= cl_max_entities) + { + if (!cl_entities) + Sys_Error("CL_ExpandEntities: cl_entities not initialized"); + if (num >= MAX_EDICTS) + Host_Error("CL_ExpandEntities: num %i >= %i", num, MAX_EDICTS); + oldmaxentities = cl_max_entities; + oldentities = cl_entities; + cl_max_entities = (num & ~255) + 256; + cl_entities = (entity_t *)Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t)); + memcpy(cl_entities, oldentities, oldmaxentities * sizeof(entity_t)); + Mem_Free(oldentities); + for (i = oldmaxentities;i < cl_max_entities;i++) + { + cl_entities[i].state_baseline = defaultstate; + cl_entities[i].state_previous = defaultstate; + cl_entities[i].state_current = defaultstate; + } + } +} + /* ===================== CL_Disconnect @@ -233,7 +297,7 @@ void CL_EstablishConnection(const char *host) CL_Disconnect(); NetConn_ClientFrame(); NetConn_ServerFrame(); - + if (LHNETADDRESS_FromString(&cls.connect_address, host, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address))) { cls.connect_trying = true; @@ -279,9 +343,9 @@ static void CL_PrintEntities_f(void) strlcpy (name, ent->render.model->name, 25); else strcpy(name, "--no model--"); - for (j = strlen(name);j < 25;j++) + for (j = (int)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); + Con_Printf("%3i: %s:%4i (%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); } } @@ -362,7 +426,7 @@ static float CL_LerpPoint(void) // 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 || cl.islocalgame) + if (!f || cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)) { cl.time = cl.mtime[0]; return 1; @@ -431,7 +495,7 @@ void CL_AllocDlight(entity_render_t *ent, matrix4x4_t *matrix, float radius, flo if (ent) { dl = cl_dlights; - for (i = 0;i < MAX_DLIGHTS;i++, dl++) + for (i = 0;i < cl_activedlights;i++, dl++) if (dl->ent == ent) goto dlightsetup; } @@ -439,9 +503,15 @@ void CL_AllocDlight(entity_render_t *ent, matrix4x4_t *matrix, float radius, flo // then look for anything else dl = cl_dlights; - for (i = 0;i < MAX_DLIGHTS;i++, dl++) + for (i = 0;i < cl_activedlights;i++, dl++) if (!dl->radius) goto dlightsetup; + // if we hit the end of the active dlights and found no gaps, add a new one + if (i < MAX_DLIGHTS) + { + cl_activedlights = i + 1; + goto dlightsetup; + } // unable to find one return; @@ -478,16 +548,70 @@ dlightsetup: dl->specularscale = specularscale; } +// called before entity relinking void CL_DecayLights(void) { - int i; + int i, oldmax; dlight_t *dl; - float time; + float time, f; time = cl.time - cl.oldtime; - for (i = 0, dl = cl_dlights;i < MAX_DLIGHTS;i++, dl++) + oldmax = cl_activedlights; + cl_activedlights = 0; + for (i = 0, dl = cl_dlights;i < oldmax;i++, dl++) + { if (dl->radius) - dl->radius = (cl.time < dl->die) ? max(0, dl->radius - time * dl->decay) : 0; + { + f = dl->radius - time * dl->decay; + if (cl.time < dl->die && f > 0) + { + dl->radius = dl->radius - time * dl->decay; + cl_activedlights = i + 1; + } + else + dl->radius = 0; + } + } +} + +// called after entity relinking +void CL_UpdateLights(void) +{ + int i, j, k, l; + dlight_t *dl; + float frac, f; + + r_refdef.numlights = 0; + if (r_dynamic.integer) + { + for (i = 0, dl = cl_dlights;i < cl_activedlights;i++, dl++) + { + if (dl->radius) + { + R_RTLight_Update(dl, false); + r_refdef.lights[r_refdef.numlights++] = dl; + } + } + } + +// light animations +// 'm' is normal light, 'a' is no light, 'z' is double bright + f = cl.time * 10; + i = (int)floor(f); + frac = f - i; + for (j = 0;j < MAX_LIGHTSTYLES;j++) + { + if (!cl_lightstyle || !cl_lightstyle[j].length) + { + r_refdef.lightstylevalue[j] = 256; + continue; + } + k = i % cl_lightstyle[j].length; + l = (i-1) % cl_lightstyle[j].length; + k = cl_lightstyle[j].map[k] - 'a'; + l = cl_lightstyle[j].map[l] - 'a'; + r_refdef.lightstylevalue[j] = ((k*frac)+(l*(1-frac)))*22; + } } #define MAXVIEWMODELS 32 @@ -511,9 +635,10 @@ void CL_LinkNetworkEntity(entity_t *e) matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2; //matrix4x4_t dlightmatrix; int j, k, l, trailtype, temp; - float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v[3], v2[3], d; + float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v2[3], d; entity_t *t; model_t *model; + trace_t trace; //entity_persistent_t *p = &e->persistent; //entity_render_t *r = &e->render; if (e->persistent.linkframe != entitylinkframenumber) @@ -526,22 +651,54 @@ void CL_LinkNetworkEntity(entity_t *e) e->render.scale = e->state_current.scale * (1.0f / 16.0f); // FIXME: interpolate? e->render.flags = e->state_current.flags; e->render.effects = e->state_current.effects; + VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod); if (e->state_current.flags & RENDER_COLORMAPPED) + { + int cb; + unsigned char *cbcolor; e->render.colormap = e->state_current.colormap; - else if (cl.scores != NULL && e->state_current.colormap) + cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12; + cbcolor = (unsigned char *) (&palette_complete[cb]); + e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0]; + e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1]; + e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2]; + cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12; + cbcolor = (unsigned char *) (&palette_complete[cb]); + e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0]; + e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1]; + e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2]; + } + else if (e->state_current.colormap && cl.scores != NULL) + { + int cb; + unsigned char *cbcolor; e->render.colormap = cl.scores[e->state_current.colormap - 1].colors; // color it + cb = (e->render.colormap & 0xF) << 4;cb += (cb >= 128 && cb < 224) ? 4 : 12; + cbcolor = (unsigned char *) (&palette_complete[cb]); + e->render.colormap_pantscolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0]; + e->render.colormap_pantscolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1]; + e->render.colormap_pantscolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2]; + cb = (e->render.colormap & 0xF0);cb += (cb >= 128 && cb < 224) ? 4 : 12; + cbcolor = (unsigned char *) (&palette_complete[cb]); + e->render.colormap_shirtcolor[0] = cbcolor[0] * (1.0f / 255.0f) * e->render.colormod[0]; + e->render.colormap_shirtcolor[1] = cbcolor[1] * (1.0f / 255.0f) * e->render.colormod[1]; + e->render.colormap_shirtcolor[2] = cbcolor[2] * (1.0f / 255.0f) * e->render.colormod[2]; + } else + { e->render.colormap = -1; // no special coloring + VectorClear(e->render.colormap_pantscolor); + VectorClear(e->render.colormap_shirtcolor); + } e->render.skinnum = e->state_current.skin; - VectorScale(e->state_current.colormod, (1.0f / 32.0f), e->render.colormod); - if (e->render.flags & RENDER_VIEWMODEL) + if (e->render.flags & RENDER_VIEWMODEL && !e->state_current.tagentity) { if (!r_drawviewmodel.integer || chase_active.integer || envmap) return; if (cl.viewentity) CL_LinkNetworkEntity(cl_entities + cl.viewentity); matrix = &viewmodelmatrix; - if (e == &cl.viewent && cl.viewentity >= 0 && cl.viewentity < MAX_EDICTS && cl_entities[cl.viewentity].state_current.active) + if (e == &cl.viewent && cl_entities[cl.viewentity].state_current.active) { e->state_current.alpha = cl_entities[cl.viewentity].state_current.alpha; e->state_current.effects = EF_NOSHADOW | (cl_entities[cl.viewentity].state_current.effects & (EF_ADDITIVE | EF_REFLECTIVE | EF_FULLBRIGHT | EF_NODEPTHTEST)); @@ -549,7 +706,11 @@ void CL_LinkNetworkEntity(entity_t *e) } else { + // if the tag entity is currently impossible, skip it + if (e->state_current.tagentity >= cl_num_entities) + return; t = cl_entities + e->state_current.tagentity; + // if the tag entity is inactive, skip it if (!t->state_current.active) return; // note: this can link to world @@ -557,20 +718,21 @@ void CL_LinkNetworkEntity(entity_t *e) // make relative to the entity matrix = &t->render.matrix; // some properties of the tag entity carry over - e->render.flags |= t->render.flags & RENDER_EXTERIORMODEL; + e->render.flags |= t->render.flags & (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL); // if a valid tagindex is used, make it relative to that tag instead // FIXME: use a model function to get tag info (need to handle skeletal) - if (e->state_current.tagentity && e->state_current.tagindex >= 1 && (model = t->render.model) && e->state_current.tagindex <= t->render.model->alias.aliasnum_tags) + if (e->state_current.tagentity && e->state_current.tagindex >= 1 && (model = t->render.model)) { // blend the matrices memset(&blendmatrix, 0, sizeof(blendmatrix)); for (j = 0;j < 4 && t->render.frameblend[j].lerp > 0;j++) { - matrix = &t->render.model->alias.aliasdata_tags[t->render.frameblend[j].frame * t->render.model->alias.aliasnum_tags + (e->state_current.tagindex - 1)].matrix; + matrix4x4_t tagmatrix; + Mod_Alias_GetTagMatrix(model, t->render.frameblend[j].frame, e->state_current.tagindex - 1, &tagmatrix); d = t->render.frameblend[j].lerp; for (l = 0;l < 4;l++) for (k = 0;k < 4;k++) - blendmatrix.m[l][k] += d * matrix->m[l][k]; + blendmatrix.m[l][k] += d * tagmatrix.m[l][k]; } // concat the tag matrices onto the entity matrix Matrix4x4_Concat(&tempmatrix, &t->render.matrix, &blendmatrix); @@ -580,7 +742,15 @@ void CL_LinkNetworkEntity(entity_t *e) } // movement lerp - if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1) + // if it's the player entity, update according to client movement + if (e == cl_entities + cl.playerentity && cl.movement) + { + lerp = (cl.time - cl.mtime[1]) / (cl.mtime[0] - cl.mtime[1]); + lerp = bound(0, lerp, 1); + VectorLerp(cl.movement_oldorigin, lerp, cl.movement_origin, origin); + VectorSet(angles, 0, cl.viewangles[1], 0); + } + else if (e->persistent.lerpdeltatime > 0 && (lerp = (cl.time - e->persistent.lerpstarttime) / e->persistent.lerpdeltatime) < 1) { // interpolate the origin and angles VectorLerp(e->persistent.oldorigin, lerp, e->persistent.neworigin, origin); @@ -601,7 +771,6 @@ void CL_LinkNetworkEntity(entity_t *e) e->render.model = cl.model_precache[e->state_current.modelindex]; if (e->render.model) { - Mod_CheckLoaded(e->render.model); // if model is alias or this is a tenebrae-like dlight, reverse pitch direction if (e->render.model->type == mod_alias || (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC)) angles[0] = -angles[0]; @@ -612,9 +781,8 @@ void CL_LinkNetworkEntity(entity_t *e) origin[2] += (cos(cl.time * cl_itembobspeed.value * (2.0 * M_PI)) + 1.0) * 0.5 * cl_itembobheight.value; } // transfer certain model flags to effects - if (e->render.model->flags2 & EF_FULLBRIGHT) - e->render.effects |= EF_FULLBRIGHT; - if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e - cl_entities) + e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE); + if (cl_prydoncursor.integer && (e->render.effects & EF_SELECTABLE) && cl.cmd.cursor_entitynumber == e->state_current.number) VectorScale(e->render.colormod, 2, e->render.colormod); } @@ -653,9 +821,19 @@ void CL_LinkNetworkEntity(entity_t *e) CL_BoundingBoxForEntity(&e->render); // handle effects now that we know where this entity is in the world... - origin[0] = e->render.matrix.m[0][3]; - origin[1] = e->render.matrix.m[1][3]; - origin[2] = e->render.matrix.m[2][3]; + if (e->render.model && e->render.model->soundfromcenter) + { + // bmodels are treated specially since their origin is usually '0 0 0' + vec3_t o; + VectorMAM(0.5f, e->render.model->normalmins, 0.5f, e->render.model->normalmaxs, o); + Matrix4x4_Transform(&e->render.matrix, o, origin); + } + else + { + origin[0] = e->render.matrix.m[0][3]; + origin[1] = e->render.matrix.m[1][3]; + origin[2] = e->render.matrix.m[2][3]; + } trailtype = -1; dlightradius = 0; dlightcolor[0] = 0; @@ -746,11 +924,11 @@ void CL_LinkNetworkEntity(entity_t *e) if (e->persistent.muzzleflash > 0) { Matrix4x4_Transform(&e->render.matrix, muzzleflashorigin, v2); - CL_TraceLine(origin, v2, v, NULL, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY); + trace = CL_TraceBox(origin, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false); tempmatrix = e->render.matrix; - tempmatrix.m[0][3] = v[0]; - tempmatrix.m[1][3] = v[1]; - tempmatrix.m[2][3] = v[2]; + tempmatrix.m[0][3] = trace.endpos[0]; + tempmatrix.m[1][3] = trace.endpos[1]; + tempmatrix.m[2][3] = trace.endpos[2]; CL_AllocDlight(NULL, &tempmatrix, 100, e->persistent.muzzleflash, e->persistent.muzzleflash, e->persistent.muzzleflash, 0, 0, 0, -1, true, 0, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); e->persistent.muzzleflash -= cl.frametime * 10; } @@ -815,14 +993,14 @@ void CL_LinkNetworkEntity(entity_t *e) // * 4 for the expansion from 0-255 to 0-1023 range, // / 255 to scale down byte colors dlightradius = max(dlightradius, e->state_current.glowsize * 4); - VectorMA(dlightcolor, (1.0f / 255.0f), (qbyte *)&palette_complete[e->state_current.glowcolor], dlightcolor); + VectorMA(dlightcolor, (1.0f / 255.0f), (unsigned char *)&palette_complete[e->state_current.glowcolor], dlightcolor); } // make the glow dlight if (dlightradius > 0 && (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(e->render.flags & RENDER_VIEWMODEL)) { //dlightmatrix = e->render.matrix; // hack to make glowing player light shine on their gun - //if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/) + //if (e->state_current.number == cl.viewentity/* && !chase_active.integer*/) // dlightmatrix.m[2][3] += 30; CL_AllocDlight(&e->render, &e->render.matrix, dlightradius, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); } @@ -849,7 +1027,7 @@ void CL_LinkNetworkEntity(entity_t *e) if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite) e->render.effects |= EF_ADDITIVE; // player model is only shown with chase_active on - if (e - cl_entities == cl.viewentity) + if (e->state_current.number == cl.viewentity) e->render.flags |= RENDER_EXTERIORMODEL; // transparent stuff can't be lit during the opaque stage if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1) @@ -863,17 +1041,15 @@ void CL_LinkNetworkEntity(entity_t *e) && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cl.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer))) e->render.flags |= RENDER_SHADOW; // as soon as player is known we can call V_CalcRefDef - if ((e - cl_entities) == cl.viewentity) + if (e->state_current.number == cl.viewentity) V_CalcRefdef(); if (e->render.model && e->render.model->name[0] == '*' && e->render.model->TraceBox) - cl_brushmodel_entities[cl_num_brushmodel_entities++] = &e->render; + cl_brushmodel_entities[cl_num_brushmodel_entities++] = e->state_current.number; // don't show entities with no modelindex (note: this still shows // entities which have a modelindex that resolved to a NULL model) if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities) r_refdef.entities[r_refdef.numentities++] = &e->render; - if (cl_num_entities < e->state_current.number + 1) - cl_num_entities = e->state_current.number + 1; - //if (cl.viewentity && e - cl_entities == cl.viewentity) + //if (cl.viewentity && e->state_current.number == cl.viewentity) // Matrix4x4_Print(&e->render.matrix); } } @@ -881,9 +1057,7 @@ void CL_LinkNetworkEntity(entity_t *e) void CL_RelinkWorld(void) { entity_t *ent = &cl_entities[0]; - if (cl_num_entities < 1) - cl_num_entities = 1; - cl_brushmodel_entities[cl_num_brushmodel_entities++] = &ent->render; + cl_brushmodel_entities[cl_num_brushmodel_entities++] = 0; // FIXME: this should be done at load Matrix4x4_CreateIdentity(&ent->render.matrix); Matrix4x4_CreateIdentity(&ent->render.inversematrix); @@ -903,7 +1077,6 @@ static void CL_RelinkStaticEntities(void) entity_t *e; for (i = 0, e = cl_static_entities;i < cl_num_static_entities && r_refdef.numentities < r_refdef.maxentities;i++, e++) { - Mod_CheckLoaded(e->render.model); e->render.flags = 0; // transparent stuff can't be lit during the opaque stage if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1) @@ -939,7 +1112,7 @@ static void CL_RelinkNetworkEntities(void) ent->state_current.modelindex = cl.stats[STAT_WEAPON]; ent->state_current.frame = cl.stats[STAT_WEAPONFRAME]; ent->state_current.flags = RENDER_VIEWMODEL; - if (cl.stats[STAT_HEALTH] <= 0 || cl.intermission) + if ((cl.stats[STAT_HEALTH] <= 0 && cl_deathnoviewmodel.integer) || cl.intermission) ent->state_current.modelindex = 0; else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) { @@ -959,10 +1132,11 @@ static void CL_RelinkNetworkEntities(void) // start on the entity after the world entitylinkframenumber++; - for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS;i++, ent++) + for (i = 1;i < cl_num_entities;i++) { if (cl_entities_active[i]) { + ent = cl_entities + i; if (ent->state_current.active) CL_LinkNetworkEntity(ent); else @@ -1145,10 +1319,13 @@ void CL_LerpPlayer(float frac) int i; float d; - cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold); - + cl.viewzoom = cl.mviewzoom[1] + frac * (cl.mviewzoom[0] - cl.mviewzoom[1]); for (i = 0;i < 3;i++) + { + cl.punchangle[i] = cl.mpunchangle[1][i] + frac * (cl.mpunchangle[0][i] - cl.mpunchangle[1][i]); + cl.punchvector[i] = cl.mpunchvector[1][i] + frac * (cl.mpunchvector[0][i] - cl.mpunchvector[1][i]); cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]); + } if (cls.demoplayback) { @@ -1172,6 +1349,7 @@ CL_ReadFromServer Read all incoming data from the server =============== */ +extern void CL_ClientMovement_Replay(); int CL_ReadFromServer(void) { CL_ReadDemoMessage(); @@ -1179,7 +1357,7 @@ int CL_ReadFromServer(void) r_refdef.time = cl.time; r_refdef.extraupdate = !r_speeds.integer; r_refdef.numentities = 0; - cl_num_entities = 0; + Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix); cl_num_brushmodel_entities = 0; if (cls.state == ca_connected && cls.signon == SIGNONS) @@ -1192,6 +1370,7 @@ int CL_ReadFromServer(void) V_FadeViewFlashs(); // relink network entities (note: this sets up the view!) + CL_ClientMovement_Replay(); CL_RelinkNetworkEntities(); // move particles @@ -1207,6 +1386,8 @@ int CL_ReadFromServer(void) // run cgame code (which can add more entities) CL_CGVM_Frame(); + CL_UpdateLights(); + // update view blend V_CalcViewBlend(); } @@ -1219,11 +1400,9 @@ int CL_ReadFromServer(void) CL_SendCmd ================= */ +void CL_UpdatePrydonCursor(void); void CL_SendCmd(void) { - if (cls.signon == SIGNONS) - CL_SendMove(); - if (cls.demoplayback) { SZ_Clear(&cls.message); @@ -1300,6 +1479,20 @@ static void CL_TimeRefresh_f (void) Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta); } +/* +=========== +CL_Shutdown +=========== +*/ +void CL_Shutdown (void) +{ + CL_CGVM_Shutdown(); + CL_Particles_Shutdown(); + CL_Parse_Shutdown(); + + Mem_FreePool (&cl_mempool); +} + /* ================= CL_Init @@ -1307,18 +1500,19 @@ CL_Init */ void CL_Init (void) { - cl_entities_mempool = Mem_AllocPool("client entities", 0, NULL); - cl_refdef_mempool = Mem_AllocPool("refdef", 0, NULL); + cl_mempool = Mem_AllocPool("client", 0, NULL); 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); + r_refdef.entities = (entity_render_t **)Mem_Alloc(cl_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); + r_refdef.drawqueue = (unsigned char *)Mem_Alloc(cl_mempool, r_refdef.maxdrawqueuesize); - SZ_Alloc (&cls.message, 1024, "cls.message"); + cls.message.data = cls.message_buf; + cls.message.maxsize = sizeof(cls.message_buf); + cls.message.cursize = 0; CL_InitInput (); @@ -1367,7 +1561,7 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_explosions_size_end); Cvar_RegisterVariable(&cl_explosions_lifetime); Cvar_RegisterVariable(&cl_stainmaps); - Cvar_RegisterVariable(&cl_stainmapsclearonload); + Cvar_RegisterVariable(&cl_stainmaps_clearonload); Cvar_RegisterVariable(&cl_beams_polygons); Cvar_RegisterVariable(&cl_beams_relative); Cvar_RegisterVariable(&cl_beams_lightatend); @@ -1375,6 +1569,8 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_prydoncursor); + Cvar_RegisterVariable(&cl_deathnoviewmodel); + Cmd_AddCommand("timerefresh", CL_TimeRefresh_f); CL_Parse_Init();