asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Check skeleton RID when using cached AABB

Browse source
This commit is contained in:
Erik Johnson 2023-12-16 17:36:03 -05:00
parent 2d0ee20ff3
commit d874ead58d
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
View file

@ -657,7 +657,8 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
Skeleton *skeleton = skeleton_owner.get_or_null(p_skeleton); Skeleton *skeleton = skeleton_owner.get_or_null(p_skeleton);
if (!skeleton || skeleton->size == 0 || mesh->skeleton_aabb_version == skeleton->version) { // A mesh can be shared by multiple skeletons and we need to avoid using the AABB from a different skeleton.
if (!skeleton || skeleton->size == 0 || (mesh->skeleton_aabb_version == skeleton->version && mesh->skeleton_aabb_rid == p_skeleton)) {
return mesh->aabb; return mesh->aabb;
} }
@ -763,6 +764,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
mesh->aabb = aabb; mesh->aabb = aabb;
mesh->skeleton_aabb_version = skeleton->version; mesh->skeleton_aabb_version = skeleton->version;
mesh->skeleton_aabb_rid = p_skeleton;
return aabb; return aabb;
} }

1
servers/rendering/renderer_rd/storage_rd/mesh_storage.h
View file

@ -153,6 +153,7 @@ private:
AABB aabb; AABB aabb;
AABB custom_aabb; AABB custom_aabb;
uint64_t skeleton_aabb_version = 0; uint64_t skeleton_aabb_version = 0;
RID skeleton_aabb_rid;
Vector<RID> material_cache; Vector<RID> material_cache;