Cache mesh AABB when modified by skeleton and update instance AABB when
skeleton changes
This commit is contained in:
parent
1c5cfc4675
commit
b7088bbf52
4 changed files with 8 additions and 3 deletions
|
@ -528,7 +528,7 @@ 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) {
|
||||
if (!skeleton || skeleton->size == 0 || mesh->skeleton_aabb_version == skeleton->version) {
|
||||
return mesh->aabb;
|
||||
}
|
||||
|
||||
|
@ -622,6 +622,8 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
|
|||
}
|
||||
}
|
||||
|
||||
mesh->aabb = aabb;
|
||||
mesh->skeleton_aabb_version = skeleton->version;
|
||||
return aabb;
|
||||
}
|
||||
|
||||
|
|
|
@ -126,6 +126,7 @@ struct Mesh {
|
|||
|
||||
AABB aabb;
|
||||
AABB custom_aabb;
|
||||
uint64_t skeleton_aabb_version = 0;
|
||||
|
||||
Vector<RID> material_cache;
|
||||
|
||||
|
|
|
@ -715,6 +715,8 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
|
|||
}
|
||||
}
|
||||
|
||||
mesh->aabb = aabb;
|
||||
|
||||
mesh->skeleton_aabb_version = skeleton->version;
|
||||
return aabb;
|
||||
}
|
||||
|
|
|
@ -476,6 +476,7 @@ public:
|
|||
Instance *instance = (Instance *)tracker->userdata;
|
||||
switch (p_notification) {
|
||||
case Dependency::DEPENDENCY_CHANGED_SKELETON_DATA:
|
||||
case Dependency::DEPENDENCY_CHANGED_SKELETON_BONES:
|
||||
case Dependency::DEPENDENCY_CHANGED_AABB: {
|
||||
singleton->_instance_queue_update(instance, true, false);
|
||||
|
||||
|
@ -491,8 +492,7 @@ public:
|
|||
case Dependency::DEPENDENCY_CHANGED_REFLECTION_PROBE: {
|
||||
singleton->_instance_queue_update(instance, true, true);
|
||||
} break;
|
||||
case Dependency::DEPENDENCY_CHANGED_MULTIMESH_VISIBLE_INSTANCES:
|
||||
case Dependency::DEPENDENCY_CHANGED_SKELETON_BONES: {
|
||||
case Dependency::DEPENDENCY_CHANGED_MULTIMESH_VISIBLE_INSTANCES: {
|
||||
//ignored
|
||||
} break;
|
||||
case Dependency::DEPENDENCY_CHANGED_LIGHT_SOFT_SHADOW_AND_PROJECTOR: {
|
||||
|
|
Loading…
Reference in a new issue