X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=afb593abeba801b4827d2ff8975080598d3ba5af;hb=17dc94051ad4df6553fc5e4694ca9b55d55cb612;hp=c95107d5dd61776adb7d72f8325dad322930ffd5;hpb=07c3a57d8ea2e9ecb5c0a98f99939d931e9f91d6;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index c95107d5..afb593ab 100644 --- a/cl_main.c +++ b/cl_main.c @@ -63,8 +63,7 @@ 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; +mempool_t *cl_mempool; client_static_t cls; client_state_t cl; @@ -86,7 +85,7 @@ 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; @@ -103,12 +102,22 @@ 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 @@ -122,7 +131,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; @@ -131,19 +140,15 @@ void CL_ClearState(void) 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(); + cl_entities = Mem_Alloc(cl_mempool, cl_max_entities * sizeof(entity_t)); + cl_entities_active = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(qbyte)); + cl_static_entities = Mem_Alloc(cl_mempool, cl_max_static_entities * sizeof(entity_t)); + cl_temp_entities = Mem_Alloc(cl_mempool, cl_max_temp_entities * sizeof(entity_t)); + cl_effects = Mem_Alloc(cl_mempool, cl_max_effects * sizeof(cl_effect_t)); + cl_beams = Mem_Alloc(cl_mempool, cl_max_beams * sizeof(beam_t)); + cl_dlights = Mem_Alloc(cl_mempool, cl_max_dlights * sizeof(dlight_t)); + cl_lightstyle = Mem_Alloc(cl_mempool, cl_max_lightstyle * sizeof(lightstyle_t)); + cl_brushmodel_entities = Mem_Alloc(cl_mempool, cl_max_brushmodel_entities * sizeof(int)); // LordHavoc: have to set up the baseline info for alpha and other stuff for (i = 0;i < cl_max_entities;i++) @@ -153,9 +158,36 @@ void CL_ClearState(void) cl_entities[i].state_current = defaultstate; } + 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) + Host_Error("CL_ExpandEntities: cl_entities not initialized\n"); + if (num >= MAX_EDICTS) + Host_Error("CL_ExpandEntities: num %i >= %i\n", num, MAX_EDICTS); + oldmaxentities = cl_max_entities; + oldentities = cl_entities; + cl_max_entities = (num & ~255) + 256; + cl_entities = 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 @@ -541,7 +573,7 @@ void CL_LinkNetworkEntity(entity_t *e) 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 +581,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 @@ -614,7 +650,7 @@ void CL_LinkNetworkEntity(entity_t *e) } // transfer certain model flags to effects 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 - cl_entities) + 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); } @@ -822,7 +858,7 @@ void CL_LinkNetworkEntity(entity_t *e) { //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 +885,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 +899,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 +915,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); @@ -959,7 +991,7 @@ static void CL_RelinkNetworkEntities(void) // start on the entity after the world entitylinkframenumber++; - for (i = 1;i < MAX_EDICTS;i++) + for (i = 1;i < cl_num_entities;i++) { if (cl_entities_active[i]) { @@ -1183,7 +1215,6 @@ int CL_ReadFromServer(void) r_refdef.time = cl.time; r_refdef.extraupdate = !r_speeds.integer; r_refdef.numentities = 0; - cl_num_entities = 0; cl_num_brushmodel_entities = 0; if (cls.state == ca_connected && cls.signon == SIGNONS) @@ -1315,10 +1346,7 @@ void CL_Shutdown (void) CL_Particles_Shutdown(); CL_Parse_Shutdown(); - SZ_Free (&cls.message); - - Mem_FreePool (&cl_entities_mempool); - Mem_FreePool (&cl_refdef_mempool); + Mem_FreePool (&cl_mempool); } /* @@ -1328,18 +1356,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 = 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 = 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 ();