mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move 3D scene import classes to their own folder

Browse Source
This commit is contained in:
Aaron Franke 2021-10-09 01:12:51 -05:00
parent f4059d0e3c
commit 9753a35c76
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
27 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/editor_node.cpp
View File

@ -113,9 +113,12 @@
#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"
@ -123,12 +126,10 @@
#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"

2
editor/editor_plugin.cpp
View File

@ -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"

2
editor/filesystem_dock.cpp
View File

@ -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"

0
editor/import/collada.cpp → editor/import/3d/collada.cpp
View File

0
editor/import/collada.h → editor/import/3d/collada.h
View File

2
editor/import/editor_import_collada.cpp → editor/import/3d/editor_import_collada.cpp
View File

@ -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"

2
editor/import/editor_import_collada.h → editor/import/3d/editor_import_collada.h
View File

@ -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);

2
editor/import/post_import_plugin_skeleton_renamer.cpp → editor/import/3d/post_import_plugin_skeleton_renamer.cpp
View File

@ -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"

0
editor/import/post_import_plugin_skeleton_renamer.h → editor/import/3d/post_import_plugin_skeleton_renamer.h
View File

2
editor/import/post_import_plugin_skeleton_rest_fixer.cpp → editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
View File

@ -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"

0
editor/import/post_import_plugin_skeleton_rest_fixer.h → editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
View File

2
editor/import/post_import_plugin_skeleton_track_organizer.cpp → editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
View File

@ -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"

0
editor/import/post_import_plugin_skeleton_track_organizer.h → editor/import/3d/post_import_plugin_skeleton_track_organizer.h
View File

0
editor/import/resource_importer_obj.cpp → editor/import/3d/resource_importer_obj.cpp
View File

0
editor/import/resource_importer_obj.h → editor/import/3d/resource_importer_obj.h
View File

2
editor/import/resource_importer_scene.cpp → editor/import/3d/resource_importer_scene.cpp
View File

@ -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"

0
editor/import/resource_importer_scene.h → editor/import/3d/resource_importer_scene.h
View File

0
editor/import/scene_import_settings.cpp → editor/import/3d/scene_import_settings.cpp
View File

2
editor/import/scene_import_settings.h → editor/import/3d/scene_import_settings.h
View File

@ -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"

1
editor/import/SCsub
View File

@ -3,3 +3,4 @@
Import("env")
env.add_source_files(env.editor_sources, "*.cpp")
env.add_source_files(env.editor_sources, "3d/*.cpp")

8
editor/plugins/bone_map_editor_plugin.cpp
View File

@ -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"

4
editor/register_editor_types.cpp
View File

@ -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"
@ -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"

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

@ -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";

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

@ -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;

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

@ -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;

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

@ -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;

1
scu_builders.py
View File

@ -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"])