qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 06:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[nq] Reduce entity churn

Browse source 
While chasing down the grenade explosion bug, I noticed that entities
were being created and destroyed (or really, not destroyed) just to
check of the entity was valid. In the old system, this wasn't
*horrible*, but with the ECS, it does mean entities and components are
getting churned up, which wouldn't be good for the entity generation
counter (only 12 bits).
This commit is contained in:
Bill Currie 2022-10-23 22:43:45 +09:00
parent 8acd5c558b
commit cf4a3399c4
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nq/source/cl_ents.c
View file

@ -86,10 +86,16 @@ CL_ClearEnts (void)
// clear other arrays // clear other arrays
i = nq_entstates.num_frames * nq_entstates.num_entities; i = nq_entstates.num_frames * nq_entstates.num_entities;
memset (nq_entstates.frame[0], 0, i * sizeof (entity_state_t)); memset (nq_entstates.frame[0], 0, i * sizeof (entity_state_t));
memset (cl_msgtime, 0, sizeof (cl_msgtime)); memset (cl_msgtime, -1, sizeof (cl_msgtime));
set_empty (&cl_forcelink); set_empty (&cl_forcelink);
} }
static entity_t
CL_GetInvalidEntity (int num)
{
return cl_entities[num];
}
entity_t entity_t
CL_GetEntity (int num) CL_GetEntity (int num)
{ {
@ -200,29 +206,34 @@ CL_RelinkEntities (void)
for (i = 1; i < cl.num_entities; i++) { for (i = 1; i < cl.num_entities; i++) {
new = &nq_entstates.frame[0 + cl.frameIndex][i]; new = &nq_entstates.frame[0 + cl.frameIndex][i];
old = &nq_entstates.frame[1 - cl.frameIndex][i]; old = &nq_entstates.frame[1 - cl.frameIndex][i];
ent = CL_GetEntity (i);
transform_t transform = Entity_Transform (ent);
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, cl_world.scene->reg);
animation_t *animation = Ent_GetComponent (ent.id, scene_animation, cl_world.scene->reg);
visibility_t *visibility = Ent_GetComponent (ent.id, scene_visibility, cl_world.scene->reg);
vec4f_t *old_origin = Ent_GetComponent (ent.id, scene_old_origin, cl_world.scene->reg);
// if the object wasn't included in the last packet, remove it // if the object wasn't included in the last packet, remove it
entvalid = cl_msgtime[i] == cl.mtime[0]; entvalid = cl_msgtime[i] == cl.mtime[0];
if (entvalid && !new->modelindex) { if (entvalid && !new->modelindex) {
ent = CL_GetEntity (i);
CL_TransformEntity (ent, new->scale / 16.0, new->angles, CL_TransformEntity (ent, new->scale / 16.0, new->angles,
new->origin); new->origin);
entvalid = 0; entvalid = 0;
} }
if (!entvalid) { if (!entvalid) {
renderer->model = NULL; ent = CL_GetInvalidEntity (i);
animation->pose1 = animation->pose2 = -1; if (Entity_Valid (ent)) {
if (visibility->efrag) { visibility_t *visibility = Ent_GetComponent (ent.id, scene_visibility, ent.reg);
R_RemoveEfrags (ent); // just became empty if (visibility->efrag) {
R_RemoveEfrags (ent); // just became empty
}
Scene_DestroyEntity (cl_world.scene, ent);
} }
continue; continue;
} }
ent = CL_GetEntity (i);
transform_t transform = Entity_Transform (ent);
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer, ent.reg);
animation_t *animation = Ent_GetComponent (ent.id, scene_animation, ent.reg);
visibility_t *visibility = Ent_GetComponent (ent.id, scene_visibility, ent.reg);
vec4f_t *old_origin = Ent_GetComponent (ent.id, scene_old_origin, ent.reg);
if (SET_TEST_MEMBER (&cl_forcelink, i)) { if (SET_TEST_MEMBER (&cl_forcelink, i)) {
*old = *new; *old = *new;
} }