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

Merge pull request #88045 from Malcolmnixon/optimize-collider-regeneration

Browse source 
Optimize when colliders are regenerated for imported meshes
This commit is contained in:
Rémi Verschelde 2024-03-09 22:19:34 +01:00
commit 5c1b926610
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
editor/import/3d/scene_import_settings.cpp
View file

@ -443,24 +443,27 @@ void SceneImportSettingsDialog::_update_view_gizmos() {
return; return;
} }
for (const KeyValue<String, NodeData> &e : node_map) { for (const KeyValue<String, NodeData> &e : node_map) {
// Skip import nodes that aren't MeshInstance3D.
const MeshInstance3D *mesh_node = Object::cast_to<MeshInstance3D>(e.value.node);
if (mesh_node == nullptr || mesh_node->get_mesh().is_null()) {
continue;
}
// Determine if the mesh collider should be visible.
bool show_collider_view = false; bool show_collider_view = false;
if (e.value.settings.has(SNAME("generate/physics"))) { if (e.value.settings.has(SNAME("generate/physics"))) {
show_collider_view = e.value.settings[SNAME("generate/physics")]; show_collider_view = e.value.settings[SNAME("generate/physics")];
} }
MeshInstance3D *mesh_node = Object::cast_to<MeshInstance3D>(e.value.node); // Get the collider_view MeshInstance3D.
if (mesh_node == nullptr || mesh_node->get_mesh().is_null()) {
// Nothing to do.
continue;
}
TypedArray<Node> descendants = mesh_node->find_children("collider_view", "MeshInstance3D"); TypedArray<Node> descendants = mesh_node->find_children("collider_view", "MeshInstance3D");
CRASH_COND_MSG(descendants.is_empty(), "This is unreachable, since the collider view is always created even when the collision is not used! If this is triggered there is a bug on the function `_fill_scene`."); CRASH_COND_MSG(descendants.is_empty(), "This is unreachable, since the collider view is always created even when the collision is not used! If this is triggered there is a bug on the function `_fill_scene`.");
MeshInstance3D *collider_view = Object::cast_to<MeshInstance3D>(descendants[0].operator Object *());
MeshInstance3D *collider_view = static_cast<MeshInstance3D *>(descendants[0].operator Object *()); // Regenerate the physics collider for this MeshInstance3D if either:
collider_view->set_visible(show_collider_view); // - A regeneration is requested for the selected import node.
if (generate_collider) { // - The collider is being made visible.
if ((generate_collider && e.key == selected_id) || (show_collider_view && !collider_view->is_visible())) {
// This collider_view doesn't have a mesh so we need to generate a new one. // This collider_view doesn't have a mesh so we need to generate a new one.
Ref<ImporterMesh> mesh; Ref<ImporterMesh> mesh;
mesh.instantiate(); mesh.instantiate();
@ -524,6 +527,9 @@ void SceneImportSettingsDialog::_update_view_gizmos() {
collider_view->set_mesh(collider_view_mesh); collider_view->set_mesh(collider_view_mesh);
collider_view->set_transform(transform); collider_view->set_transform(transform);
} }
// Set the collider visibility.
collider_view->set_visible(show_collider_view);
} }
generate_collider = false; generate_collider = false;