Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-13 20:50:23 +01:00
Code Issues Projects Releases Wiki Activity

vk: studio: use explicitly set RI.currentmodel over entity->model

Browse Source 
`thirdperson` mode overrides entity model while leaving entity->model
with the old value. Vk renderer was assuming that those are the same.

Fixes #551
This commit is contained in:
Ivan Avdeev 2023-09-15 12:47:53 -04:00
parent 54717e60e1
commit 2e1cb8173e
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ref/vk/vk_studio.c
View File

@ -2179,18 +2179,18 @@ static void studioEntityModelDestroy(void *userdata) {
Mem_Free(entmodel->bodyparts);
}
static r_studio_entity_model_t *studioEntityModelCreate(const cl_entity_t *entity) {
static r_studio_entity_model_t *studioEntityModelCreate(const studiohdr_t *hdr, model_t *model) {
r_studio_entity_model_t *const entmodel = Mem_Calloc(vk_core.pool, sizeof(r_studio_entity_model_t));
entmodel->studio_header = m_pStudioHeader;
entmodel->bodyparts_count = m_pStudioHeader->numbodyparts; // TODO is this correct number?
entmodel->studio_header = hdr;
entmodel->bodyparts_count = hdr->numbodyparts; // TODO is this correct number?
entmodel->bodyparts = Mem_Calloc(vk_core.pool, sizeof(*entmodel->bodyparts) * entmodel->bodyparts_count);
Matrix4x4_LoadIdentity(entmodel->transform);
Matrix4x4_LoadIdentity(entmodel->prev_transform);
Matrix3x4_Copy(entmodel->prev_transform, g_studio.rotationmatrix);
entmodel->model_info = getStudioModelInfo(entity->model);
entmodel->model_info = getStudioModelInfo(model);
ASSERT(entmodel->model_info);
return entmodel;
@ -2201,14 +2201,18 @@ static r_studio_entity_model_t *studioEntityModelGet(const cl_entity_t* entity)
if (entmodel && entmodel->studio_header == m_pStudioHeader)
return entmodel;
entmodel = studioEntityModelCreate(entity);
entmodel = studioEntityModelCreate(m_pStudioHeader, RI.currentmodel);
if (!entmodel) {
ERR("Cannot create studio entity model for %s", entity->model->name);
ERR("Cannot create studio entity model for model=%p(%s)", RI.currentmodel, RI.currentmodel->name);
return NULL;
}
DEBUG("Created studio entity %p(%d) model %s: %p (bodyparts=%d)",
entity, entity->index, entity->model->name, entmodel, entmodel->bodyparts_count);
DEBUG("Created studioEntityModel=%p entity=%p(%d) model=%p(%s) hdr=%p(%s), bodyparts=%d",
entmodel,
entity, entity->index,
RI.currentmodel, RI.currentmodel->name,
m_pStudioHeader, m_pStudioHeader->name,
entmodel->bodyparts_count);
VK_EntityDataSet(entity, entmodel, &studioEntityModelDestroy);
return entmodel;

4
ref/vk/vk_studio_model.c
View File

@ -210,7 +210,7 @@ const r_studio_model_info_t* R_StudioModelPreload(model_t *mod) {
r_studio_model_info_entry_t *entry = &g_studio_cache.models[g_studio_cache.models_count++];
entry->studio_header_key = hdr;
DEBUG("Studio model %s, sequences = %d:", hdr->name, hdr->numseq);
DEBUG("Studio model %p(%s) hdr=%p(%s), sequences=%d:", mod, mod->name, hdr, hdr->name, hdr->numseq);
for (int i = 0; i < hdr->numseq; ++i) {
const mstudioseqdesc_t *const pseqdesc = (mstudioseqdesc_t *)((byte *)hdr + hdr->seqindex) + i;
DEBUG(" %d: fps=%f numframes=%d", i, pseqdesc->fps, pseqdesc->numframes);
@ -285,7 +285,7 @@ r_studio_submodel_render_t *studioSubmodelRenderModelAcquire(r_studio_submodel_i
}
subinfo->render_refcount++;
DEBUG("%s: submodel=%p(%s) %s rendermodel=%p refcount=%d", __FUNCTION__, subinfo->submodel_key, mode, subinfo->submodel_key->name, render, subinfo->render_refcount);
DEBUG("%s: submodel=%p(%s) \"%s\" rendermodel=%p refcount=%d", __FUNCTION__, subinfo->submodel_key, mode, subinfo->submodel_key->name, render, subinfo->render_refcount);
return render;
}