Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move 3D scene import classes to their own folder #51569

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Move 3D scene import classes to their own folder #51569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions editor/editor_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,22 +113,23 @@
#include "editor/gui/editor_title_bar.h"
#include "editor/gui/editor_toaster.h"
#include "editor/history_dock.h"
#include "editor/import/3d/editor_import_collada.h"
#include "editor/import/3d/resource_importer_obj.h"
#include "editor/import/3d/resource_importer_scene.h"
#include "editor/import/3d/scene_import_settings.h"
#include "editor/import/audio_stream_import_settings.h"
#include "editor/import/dynamic_font_import_settings.h"
#include "editor/import/editor_import_collada.h"
#include "editor/import/resource_importer_bitmask.h"
#include "editor/import/resource_importer_bmfont.h"
#include "editor/import/resource_importer_csv_translation.h"
#include "editor/import/resource_importer_dynamic_font.h"
#include "editor/import/resource_importer_image.h"
#include "editor/import/resource_importer_imagefont.h"
#include "editor/import/resource_importer_layered_texture.h"
#include "editor/import/resource_importer_obj.h"
#include "editor/import/resource_importer_shader_file.h"
#include "editor/import/resource_importer_texture.h"
#include "editor/import/resource_importer_texture_atlas.h"
#include "editor/import/resource_importer_wav.h"
#include "editor/import/scene_import_settings.h"
#include "editor/import_dock.h"
#include "editor/inspector_dock.h"
#include "editor/multi_node_edit.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
#include "editor/editor_undo_redo_manager.h"
#include "editor/export/editor_export.h"
#include "editor/gui/editor_title_bar.h"
#include "editor/import/3d/resource_importer_scene.h"
#include "editor/import/editor_import_plugin.h"
#include "editor/import/resource_importer_scene.h"
#include "editor/inspector_dock.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "editor/plugins/editor_debugger_plugin.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/filesystem_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "editor/editor_string_names.h"
#include "editor/gui/editor_dir_dialog.h"
#include "editor/gui/editor_scene_tabs.h"
#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"
#include "editor/import_dock.h"
#include "editor/plugins/editor_resource_tooltip_plugins.h"
#include "editor/scene_create_dialog.h"
Expand Down
0 editor/import/collada.cpp → editor/import/3d/collada.cpp
View file
Open in desktop
File renamed without changes.
0 editor/import/collada.h → editor/import/3d/collada.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion editor/import/editor_import_collada.cpp → editor/import/3d/editor_import_collada.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "core/os/os.h"
#include "editor/editor_node.h"
#include "editor/import/collada.h"
#include "editor/import/3d/collada.h"
#include "scene/3d/camera_3d.h"
#include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/light_3d.h"
Expand Down
2 changes: 1 addition & 1 deletion editor/import/editor_import_collada.h → editor/import/3d/editor_import_collada.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef EDITOR_IMPORT_COLLADA_H
#define EDITOR_IMPORT_COLLADA_H

#include "editor/import/resource_importer_scene.h"
#include "editor/import/3d/resource_importer_scene.h"

class EditorSceneFormatImporterCollada : public EditorSceneFormatImporter {
GDCLASS(EditorSceneFormatImporterCollada, EditorSceneFormatImporter);
Expand Down
2 changes: 1 addition & 1 deletion ...t/post_import_plugin_skeleton_renamer.cpp → ...d/post_import_plugin_skeleton_renamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "post_import_plugin_skeleton_renamer.h"

#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"
#include "scene/3d/bone_attachment_3d.h"
#include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/skeleton_3d.h"
Expand Down
0 ...ort/post_import_plugin_skeleton_renamer.h → .../3d/post_import_plugin_skeleton_renamer.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ost_import_plugin_skeleton_rest_fixer.cpp → ...ost_import_plugin_skeleton_rest_fixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "post_import_plugin_skeleton_rest_fixer.h"

#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"
#include "scene/3d/bone_attachment_3d.h"
#include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/skeleton_3d.h"
Expand Down
0 .../post_import_plugin_skeleton_rest_fixer.h → .../post_import_plugin_skeleton_rest_fixer.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mport_plugin_skeleton_track_organizer.cpp → ...mport_plugin_skeleton_track_organizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "post_import_plugin_skeleton_track_organizer.h"

#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"
#include "scene/3d/skeleton_3d.h"
#include "scene/animation/animation_player.h"
#include "scene/resources/bone_map.h"
Expand Down
0 ..._import_plugin_skeleton_track_organizer.h → ..._import_plugin_skeleton_track_organizer.h
View file
Open in desktop
File renamed without changes.
0 editor/import/resource_importer_obj.cpp → editor/import/3d/resource_importer_obj.cpp
View file
Open in desktop
File renamed without changes.
0 editor/import/resource_importer_obj.h → editor/import/3d/resource_importer_obj.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion editor/import/resource_importer_scene.cpp → editor/import/3d/resource_importer_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "core/object/script_language.h"
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"
#include "scene/3d/area_3d.h"
#include "scene/3d/collision_shape_3d.h"
#include "scene/3d/importer_mesh_instance_3d.h"
Expand Down
0 editor/import/resource_importer_scene.h → editor/import/3d/resource_importer_scene.h
View file
Open in desktop
File renamed without changes.
0 editor/import/scene_import_settings.cpp → editor/import/3d/scene_import_settings.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion editor/import/scene_import_settings.h → editor/import/3d/scene_import_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef SCENE_IMPORT_SETTINGS_H
#define SCENE_IMPORT_SETTINGS_H

#include "editor/import/resource_importer_scene.h"
#include "editor/import/3d/resource_importer_scene.h"
#include "scene/3d/camera_3d.h"
#include "scene/3d/light_3d.h"
#include "scene/3d/mesh_instance_3d.h"
Expand Down
1 change: 1 addition & 0 deletions editor/import/SCsub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
Import("env")

env.add_source_files(env.editor_sources, "*.cpp")
env.add_source_files(env.editor_sources, "3d/*.cpp")
8 changes: 4 additions & 4 deletions editor/plugins/bone_map_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/import/post_import_plugin_skeleton_renamer.h"
#include "editor/import/post_import_plugin_skeleton_rest_fixer.h"
#include "editor/import/post_import_plugin_skeleton_track_organizer.h"
#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/post_import_plugin_skeleton_renamer.h"
#include "editor/import/3d/post_import_plugin_skeleton_rest_fixer.h"
#include "editor/import/3d/post_import_plugin_skeleton_track_organizer.h"
#include "editor/import/3d/scene_import_settings.h"
#include "scene/gui/aspect_ratio_container.h"
#include "scene/gui/separator.h"
#include "scene/gui/texture_rect.h"
Expand Down
4 changes: 2 additions & 2 deletions editor/register_editor_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
#include "editor/filesystem_dock.h"
#include "editor/gui/editor_file_dialog.h"
#include "editor/gui/editor_spin_slider.h"
#include "editor/import/3d/resource_importer_obj.h"
#include "editor/import/3d/resource_importer_scene.h"
#include "editor/import/editor_import_plugin.h"
#include "editor/import/resource_importer_bitmask.h"
#include "editor/import/resource_importer_bmfont.h"
Expand All @@ -58,8 +60,6 @@
#include "editor/import/resource_importer_image.h"
#include "editor/import/resource_importer_imagefont.h"
#include "editor/import/resource_importer_layered_texture.h"
#include "editor/import/resource_importer_obj.h"
#include "editor/import/resource_importer_scene.h"
#include "editor/import/resource_importer_shader_file.h"
#include "editor/import/resource_importer_texture.h"
#include "editor/import/resource_importer_texture_atlas.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/gui/editor_file_dialog.h"
#include "editor/import/scene_import_settings.h"
#include "editor/import/3d/scene_import_settings.h"

String SceneExporterGLTFPlugin::get_name() const {
return "ConvertGLTF2";
Expand Down
2 changes: 1 addition & 1 deletion modules/gltf/editor/editor_scene_importer_blend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#ifdef TOOLS_ENABLED

#include "editor/editor_file_system.h"
#include "editor/import/resource_importer_scene.h"
#include "editor/import/3d/resource_importer_scene.h"

class Animation;
class Node;
Expand Down
2 changes: 1 addition & 1 deletion modules/gltf/editor/editor_scene_importer_fbx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

#include "editor/editor_file_system.h"
#include "editor/fbx_importer_manager.h"
#include "editor/import/resource_importer_scene.h"
#include "editor/import/3d/resource_importer_scene.h"

class Animation;
class Node;
Expand Down
2 changes: 1 addition & 1 deletion modules/gltf/editor/editor_scene_importer_gltf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#ifdef TOOLS_ENABLED

#include "editor/import/resource_importer_scene.h"
#include "editor/import/3d/resource_importer_scene.h"

class Animation;
class Node;
Expand Down
1 change: 1 addition & 0 deletions scu_builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ def generate_scu_files(max_includes_per_scu):
process_folder(["editor/export"])
process_folder(["editor/gui"])
process_folder(["editor/import"])
process_folder(["editor/import/3d"])
process_folder(["editor/plugins"])
process_folder(["editor/plugins/gizmos"])
process_folder(["editor/plugins/tiles"])
Expand Down
Loading