X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=ef8ab01cd55361f94e9a5a73c2af692de5bd3f19;hb=4e402f83fc7aa1989f298c38847661bdf6d7883d;hp=c369a4362e0e79786a7ab853d43ee1c16310cc82;hpb=e941f7fbf97a98b3c0796ed834f580e0138c31b1;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index c369a436..ef8ab01c 100644 --- a/cl_main.c +++ b/cl_main.c @@ -130,6 +130,7 @@ void CL_ClearState(void) cl.num_brushmodel_entities = 0; // tweak these if the game runs out + cl.max_csqcrenderentities = 0; cl.max_entities = 256; cl.max_static_entities = 256; cl.max_effects = 256; @@ -145,6 +146,7 @@ void CL_ClearState(void) cl.num_effects = 0; cl.num_beams = 0; + cl.csqcrenderentities = NULL; cl.entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_entities * sizeof(entity_t)); cl.entities_active = (unsigned char *)Mem_Alloc(cls.levelmempool, cl.max_brushmodel_entities * sizeof(unsigned char)); cl.static_entities = (entity_t *)Mem_Alloc(cls.levelmempool, cl.max_static_entities * sizeof(entity_t)); @@ -190,6 +192,7 @@ void CL_ClearState(void) ent->render.alpha = 1; ent->render.flags = RENDER_SHADOW | RENDER_LIGHT; Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1); + ent->render.allowdecals = true; CL_UpdateRenderEntity(&ent->render); // noclip is turned off at start @@ -288,6 +291,26 @@ void CL_ExpandEntities(int num) } } +void CL_ExpandCSQCRenderEntities(int num) +{ + int oldmaxcsqcrenderentities; + entity_render_t *oldcsqcrenderentities; + if (num >= cl.max_csqcrenderentities) + { + if (num >= MAX_EDICTS) + Host_Error("CL_ExpandEntities: num %i >= %i", num, MAX_EDICTS); + oldmaxcsqcrenderentities = cl.max_csqcrenderentities; + oldcsqcrenderentities = cl.csqcrenderentities; + cl.max_csqcrenderentities = (num & ~255) + 256; + cl.csqcrenderentities = (entity_render_t *)Mem_Alloc(cls.levelmempool, cl.max_csqcrenderentities * sizeof(entity_render_t)); + if (oldcsqcrenderentities) + { + memcpy(cl.csqcrenderentities, oldcsqcrenderentities, oldmaxcsqcrenderentities * sizeof(entity_render_t)); + Mem_Free(oldcsqcrenderentities); + } + } +} + /* ===================== CL_Disconnect @@ -458,17 +481,19 @@ List information on all models in the client modelindex */ static void CL_ModelIndexList_f(void) { - int i = 1; + int i; + dp_model_t *model; // Print Header Con_Printf("%3s: %-30s %-8s %-8s\n", "ID", "Name", "Type", "Triangles"); - while(cl.model_precache[i] && i != MAX_MODELS) - { // Valid Model - if(cl.model_precache[i]->loaded || i == 1) - Con_Printf("%3i: %-30s %-8s %-10i\n", i, cl.model_precache[i]->name, cl.model_precache[i]->modeldatatypestring, cl.model_precache[i]->surfmesh.num_triangles); + for (i = -MAX_MODELS;i < MAX_MODELS;i++) + { + model = CL_GetModelByIndex(i); + if(model->loaded || i == 1) + Con_Printf("%3i: %-30s %-8s %-10i\n", i, model->name, model->modeldatatypestring, model->surfmesh.num_triangles); else - Con_Printf("%3i: %-30s %-30s\n", i, cl.model_precache[i]->name, "--no local model found--"); + Con_Printf("%3i: %-30s %-30s\n", i, model->name, "--no local model found--"); i++; } } @@ -506,7 +531,7 @@ void CL_UpdateRenderEntity(entity_render_t *ent) // update the inverse matrix for the renderer Matrix4x4_Invert_Simple(&ent->inversematrix, &ent->matrix); // update the animation blend state - R_LerpAnimation(ent); + VM_FrameBlendFromFrameGroupBlend(ent->frameblend, ent->framegroupblend, ent->model); // we need the matrix origin to center the box Matrix4x4_OriginFromMatrix(&ent->matrix, org); // update entity->render.scale because the renderer needs it @@ -831,7 +856,7 @@ void CL_AddQWCTFFlagModel(entity_t *player, int skin) if (!flagrender) return; - flagrender->model = cl.model_precache[cl.qw_modelindex_flag]; + flagrender->model = CL_GetModelByIndex(cl.qw_modelindex_flag); flagrender->skinnum = skin; flagrender->alpha = 1; VectorSet(flagrender->colormod, 1, 1, 1); @@ -918,9 +943,9 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat 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) + if (e->state_current.tagentity && e->state_current.tagindex >= 1 && t->render.model) { - if(CL_BlendTagMatrix(&t->render, e->state_current.tagindex - 1, &blendmatrix)) + if(!Mod_Alias_GetTagMatrix(t->render.model, t->render.frameblend, t->render.skeleton, e->state_current.tagindex - 1, &blendmatrix)) // i.e. no error { // concat the tag matrices onto the entity matrix Matrix4x4_Concat(&tempmatrix, &t->render.matrix, &blendmatrix); @@ -988,10 +1013,7 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat // model setup and some modelflags frame = e->state_current.frame; - if (e->state_current.modelindex < MAX_MODELS) - e->render.model = cl.model_precache[e->state_current.modelindex]; - else - e->render.model = NULL; + e->render.model = CL_GetModelByIndex(e->state_current.modelindex); if (e->render.model) { if (e->render.skinnum >= e->render.model->numskins) @@ -1098,6 +1120,7 @@ void CL_UpdateNetworkEntity(entity_t *e, int recursionlimit, qboolean interpolat e->render.flags |= RENDER_DOUBLESIDED; // make the other useful stuff + e->render.allowdecals = true; CL_UpdateRenderEntity(&e->render); } @@ -1236,6 +1259,8 @@ void CL_UpdateNetworkCollisionEntities(void) } } +extern void R_DecalSystem_Reset(decalsystem_t *decalsystem); + /* =============== CL_UpdateNetworkEntities @@ -1260,7 +1285,10 @@ void CL_UpdateNetworkEntities(void) CL_UpdateNetworkEntityTrail(ent); } else + { + R_DecalSystem_Reset(&ent->render.decalsystem); cl.entities_active[i] = false; + } } } } @@ -1479,6 +1507,7 @@ void CL_RelinkWorld(void) ent->render.flags |= RENDER_LIGHT; VectorSet(ent->render.colormod, 1, 1, 1); VectorSet(ent->render.glowmod, 1, 1, 1); + ent->render.allowdecals = true; CL_UpdateRenderEntity(&ent->render); r_refdef.scene.worldentity = &ent->render; r_refdef.scene.worldmodel = cl.worldmodel; @@ -1493,7 +1522,7 @@ static void CL_RelinkStaticEntities(void) e->render.flags = 0; // if the model was not loaded when the static entity was created we // need to re-fetch the model pointer - e->render.model = cl.model_precache[e->state_baseline.modelindex]; + e->render.model = CL_GetModelByIndex(e->state_baseline.modelindex); // either fullbright or lit if(!r_fullbright.integer) { @@ -1507,7 +1536,8 @@ static void CL_RelinkStaticEntities(void) e->render.flags |= RENDER_SHADOW; VectorSet(e->render.colormod, 1, 1, 1); VectorSet(e->render.glowmod, 1, 1, 1); - R_LerpAnimation(&e->render); + VM_FrameBlendFromFrameGroupBlend(e->render.frameblend, e->render.framegroupblend, e->render.model); + e->render.allowdecals = true; CL_UpdateRenderEntity(&e->render); r_refdef.scene.entities[r_refdef.scene.numentities++] = &e->render; } @@ -1587,10 +1617,7 @@ static void CL_RelinkEffects(void) } // normal stuff - if(e->modelindex < MAX_MODELS) - entrender->model = cl.model_precache[e->modelindex]; - else - entrender->model = cl.csqc_model_precache[-(e->modelindex+1)]; + entrender->model = CL_GetModelByIndex(e->modelindex); entrender->alpha = 1; VectorSet(entrender->colormod, 1, 1, 1); VectorSet(entrender->glowmod, 1, 1, 1); @@ -1737,7 +1764,7 @@ static void CL_RelinkQWNails(void) continue; // normal stuff - entrender->model = cl.model_precache[cl.qw_modelindex_spike]; + entrender->model = CL_GetModelByIndex(cl.qw_modelindex_spike); entrender->alpha = 1; VectorSet(entrender->colormod, 1, 1, 1); VectorSet(entrender->glowmod, 1, 1, 1);