godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #98877 from aaronfranke/4.3-gltf-preserve-visibility

Browse Source 
[4.3] GLTF: Preserve node visibility on import
This commit is contained in:
Rémi Verschelde
2024-12-05 01:09:51 +01:00
parent 982e9aeb72 3a8d4cf5b8
commit b51be503c5
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
editor/import/3d/resource_importer_scene.cpp
View File

@@ -2590,6 +2590,7 @@ Node *ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_
mesh_node->set_layer_mask(src_mesh_node->get_layer_mask()); mesh_node->set_layer_mask(src_mesh_node->get_layer_mask());
mesh_node->set_cast_shadows_setting(src_mesh_node->get_cast_shadows_setting()); mesh_node->set_cast_shadows_setting(src_mesh_node->get_cast_shadows_setting());
mesh_node->set_visible(src_mesh_node->is_visible());
mesh_node->set_visibility_range_begin(src_mesh_node->get_visibility_range_begin()); mesh_node->set_visibility_range_begin(src_mesh_node->get_visibility_range_begin());
mesh_node->set_visibility_range_begin_margin(src_mesh_node->get_visibility_range_begin_margin()); mesh_node->set_visibility_range_begin_margin(src_mesh_node->get_visibility_range_begin_margin());
mesh_node->set_visibility_range_end(src_mesh_node->get_visibility_range_end()); mesh_node->set_visibility_range_end(src_mesh_node->get_visibility_range_end());

1
editor/import/3d/scene_import_settings.cpp
View File

@@ -362,6 +362,7 @@ void SceneImportSettingsDialog::_fill_scene(Node *p_node, TreeItem *p_parent_ite
mesh_node->set_transform(src_mesh_node->get_transform()); mesh_node->set_transform(src_mesh_node->get_transform());
mesh_node->set_skin(src_mesh_node->get_skin()); mesh_node->set_skin(src_mesh_node->get_skin());
mesh_node->set_skeleton_path(src_mesh_node->get_skeleton_path()); mesh_node->set_skeleton_path(src_mesh_node->get_skeleton_path());
mesh_node->set_visible(src_mesh_node->is_visible());
if (src_mesh_node->get_mesh().is_valid()) { if (src_mesh_node->get_mesh().is_valid()) {
Ref<ImporterMesh> editor_mesh = src_mesh_node->get_mesh(); Ref<ImporterMesh> editor_mesh = src_mesh_node->get_mesh();
mesh_node->set_mesh(editor_mesh->get_mesh()); mesh_node->set_mesh(editor_mesh->get_mesh());

2
modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
View File

@@ -88,7 +88,7 @@ void SceneExporterGLTFPlugin::_popup_gltf_export_dialog() {
} }
_file_dialog->set_current_file(filename + String(".gltf")); _file_dialog->set_current_file(filename + String(".gltf"));
// Generate and refresh the export settings. // Generate and refresh the export settings.
_export_settings->generate_property_list(_gltf_document); _export_settings->generate_property_list(_gltf_document, root);
_settings_inspector->edit(nullptr); _settings_inspector->edit(nullptr);
_settings_inspector->edit(_export_settings.ptr()); _settings_inspector->edit(_export_settings.ptr());
// Show the file dialog. // Show the file dialog.

2
modules/gltf/editor/editor_scene_exporter_gltf_settings.cpp
View File

@@ -129,7 +129,7 @@ String get_friendly_config_prefix(Ref<GLTFDocumentExtension> p_extension) {
} }
// Run this before popping up the export settings, because the extensions may have changed. // Run this before popping up the export settings, because the extensions may have changed.
void EditorSceneExporterGLTFSettings::generate_property_list(Ref<GLTFDocument> p_document) { void EditorSceneExporterGLTFSettings::generate_property_list(Ref<GLTFDocument> p_document, Node *p_root) {
_property_list.clear(); _property_list.clear();
_document = p_document; _document = p_document;
String image_format_hint_string = "None,PNG,JPEG"; String image_format_hint_string = "None,PNG,JPEG";

2
modules/gltf/editor/editor_scene_exporter_gltf_settings.h
View File

@@ -55,7 +55,7 @@ protected:
bool _get_extension_setting(const String &p_name_str, Variant &r_ret) const; bool _get_extension_setting(const String &p_name_str, Variant &r_ret) const;
public: public:
void generate_property_list(Ref<GLTFDocument> p_document); void generate_property_list(Ref<GLTFDocument> p_document, Node *p_root = nullptr);
String get_copyright() const; String get_copyright() const;
void set_copyright(const String &p_copyright); void set_copyright(const String &p_copyright);

15
modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp
View File

@@ -55,19 +55,20 @@ Error GLTFDocumentExtensionConvertImporterMesh::import_post(Ref<GLTFState> p_sta
while (!queue.is_empty()) { while (!queue.is_empty()) {
List<Node *>::Element *E = queue.front(); List<Node *>::Element *E = queue.front();
Node *node = E->get(); Node *node = E->get();
ImporterMeshInstance3D *mesh_3d = cast_to<ImporterMeshInstance3D>(node); ImporterMeshInstance3D *importer_mesh_3d = Object::cast_to<ImporterMeshInstance3D>(node);
if (mesh_3d) { if (importer_mesh_3d) {
MeshInstance3D *mesh_instance_node_3d = memnew(MeshInstance3D); MeshInstance3D *mesh_instance_node_3d = memnew(MeshInstance3D);
Ref<ImporterMesh> mesh = mesh_3d->get_mesh(); Ref<ImporterMesh> mesh = importer_mesh_3d->get_mesh();
if (mesh.is_valid()) { if (mesh.is_valid()) {
Ref<ArrayMesh> array_mesh = mesh->get_mesh(); Ref<ArrayMesh> array_mesh = mesh->get_mesh();
mesh_instance_node_3d->set_name(node->get_name()); mesh_instance_node_3d->set_name(node->get_name());
mesh_instance_node_3d->set_transform(mesh_3d->get_transform()); mesh_instance_node_3d->set_transform(importer_mesh_3d->get_transform());
mesh_instance_node_3d->set_mesh(array_mesh); mesh_instance_node_3d->set_mesh(array_mesh);
mesh_instance_node_3d->set_skin(mesh_3d->get_skin()); mesh_instance_node_3d->set_skin(importer_mesh_3d->get_skin());
mesh_instance_node_3d->set_skeleton_path(mesh_3d->get_skeleton_path()); mesh_instance_node_3d->set_skeleton_path(importer_mesh_3d->get_skeleton_path());
mesh_instance_node_3d->set_visible(importer_mesh_3d->is_visible());
node->replace_by(mesh_instance_node_3d); node->replace_by(mesh_instance_node_3d);
_copy_meta(mesh_3d, mesh_instance_node_3d); _copy_meta(importer_mesh_3d, mesh_instance_node_3d);
_copy_meta(mesh.ptr(), array_mesh.ptr()); _copy_meta(mesh.ptr(), array_mesh.ptr());
delete_queue.push_back(node); delete_queue.push_back(node);
node = mesh_instance_node_3d; node = mesh_instance_node_3d;