godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86245 from ecmjohnson/fix-skeleton-culling

Browse Source 
Check skeleton RID when using cached AABB
This commit is contained in:
Rémi Verschelde 2024-01-08 11:52:41 +01:00
commit 798632422d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
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);
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;
}
@ -763,6 +764,7 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
mesh->aabb = aabb;
mesh->skeleton_aabb_version = skeleton->version;
mesh->skeleton_aabb_rid = p_skeleton;
return aabb;
}

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

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