godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move 3D-only resources to their own folder

This commit is contained in:
Aaron Franke 2021-08-13 11:42:45 -05:00
parent 1cb531ddb6
commit c399424db9
No known key found for this signature in database
GPG Key ID: 40A1750B977E56BF
86 changed files with 122 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,8 +41,8 @@
#include "scene/3d/path_3d.h" #include "scene/3d/path_3d.h"
#include "scene/3d/skeleton_3d.h" #include "scene/3d/skeleton_3d.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/animation.h" #include "scene/resources/animation.h"
#include "scene/resources/importer_mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"

2
editor/import/3d/resource_importer_obj.cpp
View File

@ -35,7 +35,7 @@
#include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"

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

@ -46,15 +46,15 @@
#include "scene/3d/physics_body_3d.h" #include "scene/3d/physics_body_3d.h"
#include "scene/3d/vehicle_body_3d.h" #include "scene/3d/vehicle_body_3d.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/3d/separation_ray_shape_3d.h"
#include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/3d/world_boundary_shape_3d.h"
#include "scene/resources/animation.h" #include "scene/resources/animation.h"
#include "scene/resources/box_shape_3d.h"
#include "scene/resources/importer_mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/resource_format_text.h" #include "scene/resources/resource_format_text.h"
#include "scene/resources/separation_ray_shape_3d.h"
#include "scene/resources/sphere_shape_3d.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "scene/resources/world_boundary_shape_3d.h"
uint32_t EditorSceneFormatImporter::get_import_flags() const { uint32_t EditorSceneFormatImporter::get_import_flags() const {
uint32_t ret; uint32_t ret;

12
editor/import/3d/resource_importer_scene.h
View File

@ -35,14 +35,14 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
#include "core/variant/dictionary.h" #include "core/variant/dictionary.h"
#include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/3d/skin.h"
#include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/animation.h" #include "scene/resources/animation.h"
#include "scene/resources/box_shape_3d.h"
#include "scene/resources/capsule_shape_3d.h"
#include "scene/resources/cylinder_shape_3d.h"
#include "scene/resources/importer_mesh.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/shape_3d.h"
#include "scene/resources/sphere_shape_3d.h"
class Material; class Material;
class AnimationPlayer; class AnimationPlayer;

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

@ -40,7 +40,7 @@
#include "editor/themes/editor_scale.h" #include "editor/themes/editor_scale.h"
#include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
class SceneImportSettingsData : public Object { class SceneImportSettingsData : public Object {

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

@ -46,7 +46,7 @@
#include "scene/gui/subviewport_container.h" #include "scene/gui/subviewport_container.h"
#include "scene/gui/tab_container.h" #include "scene/gui/tab_container.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
class EditorFileDialog; class EditorFileDialog;
class EditorInspector; class EditorInspector;

18
editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp
View File

@ -37,15 +37,15 @@
#include "editor/plugins/gizmos/gizmo_3d_helper.h" #include "editor/plugins/gizmos/gizmo_3d_helper.h"
#include "editor/plugins/node_3d_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h"
#include "scene/3d/collision_shape_3d.h" #include "scene/3d/collision_shape_3d.h"
#include "scene/resources/box_shape_3d.h" #include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/capsule_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/height_map_shape_3d.h" #include "scene/resources/3d/height_map_shape_3d.h"
#include "scene/resources/separation_ray_shape_3d.h" #include "scene/resources/3d/separation_ray_shape_3d.h"
#include "scene/resources/sphere_shape_3d.h" #include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/world_boundary_shape_3d.h" #include "scene/resources/3d/world_boundary_shape_3d.h"
CollisionShape3DGizmoPlugin::CollisionShape3DGizmoPlugin() { CollisionShape3DGizmoPlugin::CollisionShape3DGizmoPlugin() {
helper.instantiate(); helper.instantiate();

2
editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.cpp
View File

@ -33,7 +33,7 @@
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/plugins/node_3d_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h"
#include "scene/3d/spring_arm_3d.h" #include "scene/3d/spring_arm_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
void SpringArm3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) { void SpringArm3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_node_3d()); SpringArm3D *spring_arm = Object::cast_to<SpringArm3D>(p_gizmo->get_node_3d());

4
editor/plugins/material_editor_plugin.cpp
View File

@ -43,9 +43,9 @@
#include "scene/gui/color_rect.h" #include "scene/gui/color_rect.h"
#include "scene/gui/subviewport_container.h" #include "scene/gui/subviewport_container.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/fog_material.h" #include "scene/resources/3d/fog_material.h"
#include "scene/resources/3d/sky_material.h"
#include "scene/resources/particle_process_material.h" #include "scene/resources/particle_process_material.h"
#include "scene/resources/sky_material.h"
void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) { void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null()); ERR_FAIL_COND(p_event.is_null());

2
editor/plugins/material_editor_plugin.h
View File

@ -34,8 +34,8 @@
#include "editor/editor_inspector.h" #include "editor/editor_inspector.h"
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "editor/plugins/editor_resource_conversion_plugin.h" #include "editor/plugins/editor_resource_conversion_plugin.h"
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "scene/resources/primitive_meshes.h"
class Camera3D; class Camera3D;
class ColorRect; class ColorRect;

6
editor/plugins/mesh_instance_3d_editor_plugin.cpp
View File

@ -42,9 +42,9 @@
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/menu_button.h" #include "scene/gui/menu_button.h"
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
void MeshInstance3DEditor::_node_removed(Node *p_node) { void MeshInstance3DEditor::_node_removed(Node *p_node) {

2
editor/plugins/mesh_library_editor_plugin.h
View File

@ -32,7 +32,7 @@
#define MESH_LIBRARY_EDITOR_PLUGIN_H #define MESH_LIBRARY_EDITOR_PLUGIN_H
#include "editor/editor_plugin.h" #include "editor/editor_plugin.h"
#include "scene/resources/mesh_library.h" #include "scene/resources/3d/mesh_library.h"
class EditorFileDialog; class EditorFileDialog;
class ConfirmationDialog; class ConfirmationDialog;

2
editor/plugins/node_3d_editor_gizmos.cpp
View File

@ -36,7 +36,7 @@
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/editor_string_names.h" #include "editor/editor_string_names.h"
#include "editor/plugins/node_3d_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#define HANDLE_HALF_SIZE 9.5 #define HANDLE_HALF_SIZE 9.5

2
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -90,8 +90,8 @@
#include "scene/gui/flow_container.h" #include "scene/gui/flow_container.h"
#include "scene/gui/split_container.h" #include "scene/gui/split_container.h"
#include "scene/gui/subviewport_container.h" #include "scene/gui/subviewport_container.h"
#include "scene/resources/3d/sky_material.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/sky_material.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
constexpr real_t DISTANCE_DEFAULT = 4; constexpr real_t DISTANCE_DEFAULT = 4;

3
editor/plugins/skeleton_3d_editor_plugin.cpp
View File

@ -46,9 +46,8 @@
#include "scene/3d/physics_body_3d.h" #include "scene/3d/physics_body_3d.h"
#include "scene/gui/separator.h" #include "scene/gui/separator.h"
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/resources/capsule_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/skeleton_profile.h" #include "scene/resources/skeleton_profile.h"
#include "scene/resources/sphere_shape_3d.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"

2
modules/csg/csg_shape.h
View File

@ -35,7 +35,7 @@
#include "scene/3d/path_3d.h" #include "scene/3d/path_3d.h"
#include "scene/3d/visual_instance_3d.h" #include "scene/3d/visual_instance_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "thirdparty/misc/mikktspace.h" #include "thirdparty/misc/mikktspace.h"

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

@ -32,7 +32,7 @@
#include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
void GLTFDocumentExtensionConvertImporterMesh::_bind_methods() { void GLTFDocumentExtensionConvertImporterMesh::_bind_methods() {
} }

14
modules/gltf/extensions/physics/gltf_physics_shape.cpp
View File

@ -34,13 +34,13 @@
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "scene/3d/area_3d.h" #include "scene/3d/area_3d.h"
#include "scene/resources/box_shape_3d.h" #include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/capsule_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/sphere_shape_3d.h" #include "scene/resources/3d/sphere_shape_3d.h"
void GLTFPhysicsShape::_bind_methods() { void GLTFPhysicsShape::_bind_methods() {
ClassDB::bind_static_method("GLTFPhysicsShape", D_METHOD("from_node", "shape_node"), &GLTFPhysicsShape::from_node); ClassDB::bind_static_method("GLTFPhysicsShape", D_METHOD("from_node", "shape_node"), &GLTFPhysicsShape::from_node);

2
modules/gltf/gltf_document.cpp
View File

@ -50,9 +50,9 @@
#include "scene/3d/light_3d.h" #include "scene/3d/light_3d.h"
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/3d/multimesh_instance_3d.h" #include "scene/3d/multimesh_instance_3d.h"
#include "scene/resources/3d/skin.h"
#include "scene/resources/image_texture.h" #include "scene/resources/image_texture.h"
#include "scene/resources/portable_compressed_texture.h" #include "scene/resources/portable_compressed_texture.h"
#include "scene/resources/skin.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

2
modules/gltf/structures/gltf_mesh.cpp
View File

@ -30,7 +30,7 @@
#include "gltf_mesh.h" #include "gltf_mesh.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
void GLTFMesh::_bind_methods() { void GLTFMesh::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFMesh::get_original_name); ClassDB::bind_method(D_METHOD("get_original_name"), &GLTFMesh::get_original_name);

2
modules/gltf/structures/gltf_mesh.h
View File

@ -33,7 +33,7 @@
#include "../gltf_defines.h" #include "../gltf_defines.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
class GLTFMesh : public Resource { class GLTFMesh : public Resource {
GDCLASS(GLTFMesh, Resource); GDCLASS(GLTFMesh, Resource);

2
modules/gltf/structures/gltf_skin.cpp
View File

@ -33,7 +33,7 @@
#include "../gltf_template_convert.h" #include "../gltf_template_convert.h"
#include "core/variant/typed_array.h" #include "core/variant/typed_array.h"
#include "scene/resources/skin.h" #include "scene/resources/3d/skin.h"
void GLTFSkin::_bind_methods() { void GLTFSkin::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_skin_root"), &GLTFSkin::get_skin_root); ClassDB::bind_method(D_METHOD("get_skin_root"), &GLTFSkin::get_skin_root);

2
modules/gltf/structures/gltf_skin.h
View File

@ -34,7 +34,7 @@
#include "../gltf_defines.h" #include "../gltf_defines.h"
#include "core/io/resource.h" #include "core/io/resource.h"
#include "scene/resources/skin.h" #include "scene/resources/3d/skin.h"
template <typename T> template <typename T>
class TypedArray; class TypedArray;

4
modules/gridmap/grid_map.cpp
View File

@ -33,9 +33,9 @@
#include "core/core_string_names.h" #include "core/core_string_names.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
#include "scene/3d/light_3d.h" #include "scene/3d/light_3d.h"
#include "scene/resources/mesh_library.h" #include "scene/resources/3d/mesh_library.h"
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/physics_material.h" #include "scene/resources/physics_material.h"
#include "scene/resources/primitive_meshes.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/navigation_server_3d.h" #include "servers/navigation_server_3d.h"

2
modules/gridmap/grid_map.h
View File

@ -32,7 +32,7 @@
#define GRID_MAP_H #define GRID_MAP_H
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/mesh_library.h" #include "scene/resources/3d/mesh_library.h"
#include "scene/resources/multimesh.h" #include "scene/resources/multimesh.h"
//heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done.. //heh heh, godotsphir!! this shares no code and the design is completely different with previous projects i've done..

20
modules/navigation/3d/nav_mesh_generator_3d.cpp
View File

@ -38,18 +38,18 @@
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/3d/multimesh_instance_3d.h" #include "scene/3d/multimesh_instance_3d.h"
#include "scene/3d/physics_body_3d.h" #include "scene/3d/physics_body_3d.h"
#include "scene/resources/box_shape_3d.h" #include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/capsule_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/height_map_shape_3d.h" #include "scene/resources/3d/height_map_shape_3d.h"
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/3d/shape_3d.h"
#include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/3d/world_boundary_shape_3d.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation_mesh.h"
#include "scene/resources/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/primitive_meshes.h"
#include "scene/resources/shape_3d.h"
#include "scene/resources/sphere_shape_3d.h"
#include "scene/resources/world_boundary_shape_3d.h"
#include "modules/modules_enabled.gen.h" // For csg, gridmap. #include "modules/modules_enabled.gen.h" // For csg, gridmap.

2
scene/3d/collision_object_3d.cpp
View File

@ -30,7 +30,7 @@
#include "collision_object_3d.h" #include "collision_object_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
void CollisionObject3D::_notification(int p_what) { void CollisionObject3D::_notification(int p_what) {

2
scene/3d/collision_polygon_3d.cpp
View File

@ -32,7 +32,7 @@
#include "collision_object_3d.h" #include "collision_object_3d.h"
#include "core/math/geometry_2d.h" #include "core/math/geometry_2d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
void CollisionPolygon3D::_build_polygon() { void CollisionPolygon3D::_build_polygon() {
if (!collision_object) { if (!collision_object) {

2
scene/3d/collision_polygon_3d.h
View File

@ -32,7 +32,7 @@
#define COLLISION_POLYGON_3D_H #define COLLISION_POLYGON_3D_H
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class CollisionObject3D; class CollisionObject3D;
class CollisionPolygon3D : public Node3D { class CollisionPolygon3D : public Node3D {

6
scene/3d/collision_shape_3d.cpp
View File

@ -32,9 +32,9 @@
#include "mesh_instance_3d.h" #include "mesh_instance_3d.h"
#include "physics_body_3d.h" #include "physics_body_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/world_boundary_shape_3d.h" #include "scene/resources/3d/world_boundary_shape_3d.h"
#include "vehicle_body_3d.h" #include "vehicle_body_3d.h"
void CollisionShape3D::make_convex_from_siblings() { void CollisionShape3D::make_convex_from_siblings() {

2
scene/3d/collision_shape_3d.h
View File

@ -32,7 +32,7 @@
#define COLLISION_SHAPE_3D_H #define COLLISION_SHAPE_3D_H
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class CollisionObject3D; class CollisionObject3D;
class CollisionShape3D : public Node3D { class CollisionShape3D : public Node3D {

2
scene/3d/gpu_particles_3d.h
View File

@ -32,7 +32,7 @@
#define GPU_PARTICLES_3D_H #define GPU_PARTICLES_3D_H
#include "scene/3d/visual_instance_3d.h" #include "scene/3d/visual_instance_3d.h"
#include "scene/resources/skin.h" #include "scene/resources/3d/skin.h"
class GPUParticles3D : public GeometryInstance3D { class GPUParticles3D : public GeometryInstance3D {
private: private:

2
scene/3d/importer_mesh_instance_3d.cpp
View File

@ -30,7 +30,7 @@
#include "importer_mesh_instance_3d.h" #include "importer_mesh_instance_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) { void ImporterMeshInstance3D::set_mesh(const Ref<ImporterMesh> &p_mesh) {
mesh = p_mesh; mesh = p_mesh;

2
scene/3d/importer_mesh_instance_3d.h
View File

@ -33,8 +33,8 @@
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/3d/visual_instance_3d.h" #include "scene/3d/visual_instance_3d.h"
#include "scene/resources/3d/skin.h"
#include "scene/resources/immediate_mesh.h" #include "scene/resources/immediate_mesh.h"
#include "scene/resources/skin.h"
class ImporterMesh; class ImporterMesh;

4
scene/3d/mesh_instance_3d.cpp
View File

@ -32,8 +32,8 @@
#include "collision_shape_3d.h" #include "collision_shape_3d.h"
#include "physics_body_3d.h" #include "physics_body_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) { bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
//this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else. //this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else.

2
scene/3d/node_3d.h
View File

@ -32,7 +32,7 @@
#define NODE_3D_H #define NODE_3D_H
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/resources/world_3d.h" #include "scene/resources/3d/world_3d.h"
class Node3DGizmo : public RefCounted { class Node3DGizmo : public RefCounted {
GDCLASS(Node3DGizmo, RefCounted); GDCLASS(Node3DGizmo, RefCounted);

2
scene/3d/occluder_instance_3d.cpp
View File

@ -36,7 +36,7 @@
#include "core/math/triangulate.h" #include "core/math/triangulate.h"
#include "scene/3d/importer_mesh_instance_3d.h" #include "scene/3d/importer_mesh_instance_3d.h"
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

2
scene/3d/shape_cast_3d.cpp
View File

@ -32,7 +32,7 @@
#include "scene/3d/collision_object_3d.h" #include "scene/3d/collision_object_3d.h"
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
void ShapeCast3D::_notification(int p_what) { void ShapeCast3D::_notification(int p_what) {
switch (p_what) { switch (p_what) {

2
scene/3d/shape_cast_3d.h
View File

@ -32,7 +32,7 @@
#define SHAPE_CAST_3D_H #define SHAPE_CAST_3D_H
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class CollisionObject3D; class CollisionObject3D;

2
scene/3d/skeleton_3d.h
View File

@ -32,7 +32,7 @@
#define SKELETON_3D_H #define SKELETON_3D_H
#include "scene/3d/node_3d.h" #include "scene/3d/node_3d.h"
#include "scene/resources/skin.h" #include "scene/resources/3d/skin.h"
typedef int BoneId; typedef int BoneId;

2
scene/3d/spring_arm_3d.cpp
View File

@ -31,7 +31,7 @@
#include "spring_arm_3d.h" #include "spring_arm_3d.h"
#include "scene/3d/camera_3d.h" #include "scene/3d/camera_3d.h"
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
void SpringArm3D::_notification(int p_what) { void SpringArm3D::_notification(int p_what) {
switch (p_what) { switch (p_what) {

2
scene/main/scene_tree.cpp
View File

@ -55,12 +55,12 @@
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
#include "scene/resources/world_3d.h"
#include "scene/scene_string_names.h" #include "scene/scene_string_names.h"
#include "servers/display_server.h" #include "servers/display_server.h"
#include "servers/navigation_server_3d.h" #include "servers/navigation_server_3d.h"
#include "servers/physics_server_2d.h" #include "servers/physics_server_2d.h"
#ifndef _3D_DISABLED #ifndef _3D_DISABLED
#include "scene/resources/3d/world_3d.h"
#include "servers/physics_server_3d.h" #include "servers/physics_server_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
#include "window.h" #include "window.h"

30
scene/register_scene_types.cpp
View File

@ -194,7 +194,6 @@
#include "scene/resources/shader_include.h" #include "scene/resources/shader_include.h"
#include "scene/resources/skeleton_profile.h" #include "scene/resources/skeleton_profile.h"
#include "scene/resources/sky.h" #include "scene/resources/sky.h"
#include "scene/resources/sky_material.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/style_box_flat.h" #include "scene/resources/style_box_flat.h"
#include "scene/resources/style_box_line.h" #include "scene/resources/style_box_line.h"
@ -265,20 +264,21 @@
#include "scene/3d/xr_hand_modifier_3d.h" #include "scene/3d/xr_hand_modifier_3d.h"
#include "scene/3d/xr_nodes.h" #include "scene/3d/xr_nodes.h"
#include "scene/animation/root_motion_view.h" #include "scene/animation/root_motion_view.h"
#include "scene/resources/box_shape_3d.h" #include "scene/resources/3d/box_shape_3d.h"
#include "scene/resources/capsule_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/cylinder_shape_3d.h" #include "scene/resources/3d/cylinder_shape_3d.h"
#include "scene/resources/fog_material.h" #include "scene/resources/3d/fog_material.h"
#include "scene/resources/height_map_shape_3d.h" #include "scene/resources/3d/height_map_shape_3d.h"
#include "scene/resources/importer_mesh.h" #include "scene/resources/3d/importer_mesh.h"
#include "scene/resources/mesh_library.h" #include "scene/resources/3d/mesh_library.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/separation_ray_shape_3d.h" #include "scene/resources/3d/separation_ray_shape_3d.h"
#include "scene/resources/sphere_shape_3d.h" #include "scene/resources/3d/sky_material.h"
#include "scene/resources/world_3d.h" #include "scene/resources/3d/sphere_shape_3d.h"
#include "scene/resources/world_boundary_shape_3d.h" #include "scene/resources/3d/world_3d.h"
#include "scene/resources/3d/world_boundary_shape_3d.h"
#endif // _3D_DISABLED #endif // _3D_DISABLED
static Ref<ResourceFormatSaverText> resource_saver_text; static Ref<ResourceFormatSaverText> resource_saver_text;

6
scene/resources/3d/SCsub Normal file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env python
Import("env")
env.add_source_files(env.scene_sources, "*.cpp")
env.add_source_files(env.scene_sources, "skeleton/*.cpp")

0
scene/resources/box_shape_3d.cpp → scene/resources/3d/box_shape_3d.cpp
View File

2
scene/resources/box_shape_3d.h → scene/resources/3d/box_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef BOX_SHAPE_3D_H #ifndef BOX_SHAPE_3D_H
#define BOX_SHAPE_3D_H #define BOX_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class BoxShape3D : public Shape3D { class BoxShape3D : public Shape3D {
GDCLASS(BoxShape3D, Shape3D); GDCLASS(BoxShape3D, Shape3D);

0
scene/resources/capsule_shape_3d.cpp → scene/resources/3d/capsule_shape_3d.cpp
View File

2
scene/resources/capsule_shape_3d.h → scene/resources/3d/capsule_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef CAPSULE_SHAPE_3D_H #ifndef CAPSULE_SHAPE_3D_H
#define CAPSULE_SHAPE_3D_H #define CAPSULE_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class CapsuleShape3D : public Shape3D { class CapsuleShape3D : public Shape3D {
GDCLASS(CapsuleShape3D, Shape3D); GDCLASS(CapsuleShape3D, Shape3D);

0
scene/resources/concave_polygon_shape_3d.cpp → scene/resources/3d/concave_polygon_shape_3d.cpp
View File

2
scene/resources/concave_polygon_shape_3d.h → scene/resources/3d/concave_polygon_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef CONCAVE_POLYGON_SHAPE_3D_H #ifndef CONCAVE_POLYGON_SHAPE_3D_H
#define CONCAVE_POLYGON_SHAPE_3D_H #define CONCAVE_POLYGON_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class ConcavePolygonShape3D : public Shape3D { class ConcavePolygonShape3D : public Shape3D {
GDCLASS(ConcavePolygonShape3D, Shape3D); GDCLASS(ConcavePolygonShape3D, Shape3D);

0
scene/resources/convex_polygon_shape_3d.cpp → scene/resources/3d/convex_polygon_shape_3d.cpp
View File

2
scene/resources/convex_polygon_shape_3d.h → scene/resources/3d/convex_polygon_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef CONVEX_POLYGON_SHAPE_3D_H #ifndef CONVEX_POLYGON_SHAPE_3D_H
#define CONVEX_POLYGON_SHAPE_3D_H #define CONVEX_POLYGON_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class ConvexPolygonShape3D : public Shape3D { class ConvexPolygonShape3D : public Shape3D {
GDCLASS(ConvexPolygonShape3D, Shape3D); GDCLASS(ConvexPolygonShape3D, Shape3D);

0
scene/resources/cylinder_shape_3d.cpp → scene/resources/3d/cylinder_shape_3d.cpp
View File

2
scene/resources/cylinder_shape_3d.h → scene/resources/3d/cylinder_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef CYLINDER_SHAPE_3D_H #ifndef CYLINDER_SHAPE_3D_H
#define CYLINDER_SHAPE_3D_H #define CYLINDER_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class CylinderShape3D : public Shape3D { class CylinderShape3D : public Shape3D {
GDCLASS(CylinderShape3D, Shape3D); GDCLASS(CylinderShape3D, Shape3D);

0
scene/resources/fog_material.cpp → scene/resources/3d/fog_material.cpp
View File

0
scene/resources/fog_material.h → scene/resources/3d/fog_material.h
View File

0
scene/resources/height_map_shape_3d.cpp → scene/resources/3d/height_map_shape_3d.cpp
View File

2
scene/resources/height_map_shape_3d.h → scene/resources/3d/height_map_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef HEIGHT_MAP_SHAPE_3D_H #ifndef HEIGHT_MAP_SHAPE_3D_H
#define HEIGHT_MAP_SHAPE_3D_H #define HEIGHT_MAP_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class HeightMapShape3D : public Shape3D { class HeightMapShape3D : public Shape3D {
GDCLASS(HeightMapShape3D, Shape3D); GDCLASS(HeightMapShape3D, Shape3D);

0
scene/resources/importer_mesh.cpp → scene/resources/3d/importer_mesh.cpp
View File

4
scene/resources/importer_mesh.h → scene/resources/3d/importer_mesh.h
View File

@ -33,8 +33,8 @@
#include "core/io/resource.h" #include "core/io/resource.h"
#include "core/templates/local_vector.h" #include "core/templates/local_vector.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/navigation_mesh.h" #include "scene/resources/navigation_mesh.h"

0
scene/resources/mesh_library.cpp → scene/resources/3d/mesh_library.cpp
View File

0
scene/resources/mesh_library.h → scene/resources/3d/mesh_library.h
View File

0
scene/resources/primitive_meshes.cpp → scene/resources/3d/primitive_meshes.cpp
View File

0
scene/resources/primitive_meshes.h → scene/resources/3d/primitive_meshes.h
View File

0
scene/resources/separation_ray_shape_3d.cpp → scene/resources/3d/separation_ray_shape_3d.cpp
View File

2
scene/resources/separation_ray_shape_3d.h → scene/resources/3d/separation_ray_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef SEPARATION_RAY_SHAPE_3D_H #ifndef SEPARATION_RAY_SHAPE_3D_H
#define SEPARATION_RAY_SHAPE_3D_H #define SEPARATION_RAY_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class SeparationRayShape3D : public Shape3D { class SeparationRayShape3D : public Shape3D {
GDCLASS(SeparationRayShape3D, Shape3D); GDCLASS(SeparationRayShape3D, Shape3D);

0
scene/resources/shape_3d.cpp → scene/resources/3d/shape_3d.cpp
View File

0
scene/resources/shape_3d.h → scene/resources/3d/shape_3d.h
View File

0
scene/resources/skin.cpp → scene/resources/3d/skin.cpp
View File

0
scene/resources/skin.h → scene/resources/3d/skin.h
View File

0
scene/resources/sky_material.cpp → scene/resources/3d/sky_material.cpp
View File

0
scene/resources/sky_material.h → scene/resources/3d/sky_material.h
View File

0
scene/resources/sphere_shape_3d.cpp → scene/resources/3d/sphere_shape_3d.cpp
View File

2
scene/resources/sphere_shape_3d.h → scene/resources/3d/sphere_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef SPHERE_SHAPE_3D_H #ifndef SPHERE_SHAPE_3D_H
#define SPHERE_SHAPE_3D_H #define SPHERE_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class SphereShape3D : public Shape3D { class SphereShape3D : public Shape3D {
GDCLASS(SphereShape3D, Shape3D); GDCLASS(SphereShape3D, Shape3D);

0
scene/resources/world_3d.cpp → scene/resources/3d/world_3d.cpp
View File

0
scene/resources/world_3d.h → scene/resources/3d/world_3d.h
View File

0
scene/resources/world_boundary_shape_3d.cpp → scene/resources/3d/world_boundary_shape_3d.cpp
View File

2
scene/resources/world_boundary_shape_3d.h → scene/resources/3d/world_boundary_shape_3d.h
View File

@ -31,7 +31,7 @@
#ifndef WORLD_BOUNDARY_SHAPE_3D_H #ifndef WORLD_BOUNDARY_SHAPE_3D_H
#define WORLD_BOUNDARY_SHAPE_3D_H #define WORLD_BOUNDARY_SHAPE_3D_H
#include "scene/resources/shape_3d.h" #include "scene/resources/3d/shape_3d.h"
class WorldBoundaryShape3D : public Shape3D { class WorldBoundaryShape3D : public Shape3D {
GDCLASS(WorldBoundaryShape3D, Shape3D); GDCLASS(WorldBoundaryShape3D, Shape3D);

1
scene/resources/SCsub
View File

@ -24,3 +24,4 @@ env.scene_sources += scene_obj
env.Depends(scene_obj, thirdparty_obj) env.Depends(scene_obj, thirdparty_obj)
SConscript("2d/SCsub") SConscript("2d/SCsub")
SConscript("3d/SCsub")

4
scene/resources/mesh.cpp
View File

@ -34,8 +34,8 @@
#include "core/templates/pair.h" #include "core/templates/pair.h"
#include "scene/resources/surface_tool.h" #include "scene/resources/surface_tool.h"
#include "scene/resources/concave_polygon_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h"
#include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/3d/convex_polygon_shape_3d.h"
void MeshConvexDecompositionSettings::set_max_concavity(real_t p_max_concavity) { void MeshConvexDecompositionSettings::set_max_concavity(real_t p_max_concavity) {
max_concavity = CLAMP(p_max_concavity, 0.001, 1.0); max_concavity = CLAMP(p_max_concavity, 0.001, 1.0);

1
scene/resources/mesh.h
View File

@ -34,6 +34,7 @@
#include "core/io/resource.h" #include "core/io/resource.h"
#include "core/math/face3.h" #include "core/math/face3.h"
#include "core/math/triangle_mesh.h" #include "core/math/triangle_mesh.h"
#include "scene/resources/3d/shape_3d.h"
#include "scene/resources/material.h" #include "scene/resources/material.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"

1
scu_builders.py
View File

@ -316,6 +316,7 @@ def generate_scu_files(max_includes_per_scu):
process_folder(["scene/main"]) process_folder(["scene/main"])
process_folder(["scene/resources"]) process_folder(["scene/resources"])
process_folder(["scene/resources/2d"]) process_folder(["scene/resources/2d"])
process_folder(["scene/resources/3d"])
process_folder(["servers"]) process_folder(["servers"])
process_folder(["servers/rendering"]) process_folder(["servers/rendering"])

2
tests/scene/test_arraymesh.h
View File

@ -31,8 +31,8 @@
#ifndef TEST_ARRAYMESH_H #ifndef TEST_ARRAYMESH_H
#define TEST_ARRAYMESH_H #define TEST_ARRAYMESH_H
#include "scene/resources/3d/primitive_meshes.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/primitive_meshes.h"
#include "tests/test_macros.h" #include "tests/test_macros.h"

2
tests/scene/test_navigation_region_3d.h
View File

@ -34,7 +34,7 @@
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/3d/navigation_region_3d.h" #include "scene/3d/navigation_region_3d.h"
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#include "tests/test_macros.h" #include "tests/test_macros.h"

2
tests/scene/test_primitives.h
View File

@ -31,7 +31,7 @@
#ifndef TEST_PRIMITIVES_H #ifndef TEST_PRIMITIVES_H
#define TEST_PRIMITIVES_H #define TEST_PRIMITIVES_H
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#include "tests/test_macros.h" #include "tests/test_macros.h"

2
tests/servers/test_navigation_server_3d.h
View File

@ -32,7 +32,7 @@
#define TEST_NAVIGATION_SERVER_3D_H #define TEST_NAVIGATION_SERVER_3D_H
#include "scene/3d/mesh_instance_3d.h" #include "scene/3d/mesh_instance_3d.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/3d/primitive_meshes.h"
#include "servers/navigation_server_3d.h" #include "servers/navigation_server_3d.h"
#include "tests/test_macros.h" #include "tests/test_macros.h"