From 35dafc9fa8ac26cca9ca1da606cbfe782468d05f Mon Sep 17 00:00:00 2001 From: smix8 <52464204+smix8@users.noreply.github.com> Date: Mon, 26 Feb 2024 07:15:31 +0100 Subject: Split monolithic physics class files Splits monolithic physics class files. --- .../gltf/extensions/physics/gltf_document_extension_physics.cpp | 3 ++- modules/gltf/extensions/physics/gltf_physics_body.cpp | 7 +++++-- modules/gltf/extensions/physics/gltf_physics_body.h | 2 +- modules/gltf/extensions/physics/gltf_physics_shape.cpp | 2 +- modules/gltf/extensions/physics/gltf_physics_shape.h | 2 +- modules/navigation/2d/nav_mesh_generator_2d.cpp | 2 +- modules/navigation/3d/nav_mesh_generator_3d.cpp | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp b/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp index a9033de7ae..c6e34cc023 100644 --- a/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp +++ b/modules/gltf/extensions/physics/gltf_document_extension_physics.cpp @@ -30,7 +30,8 @@ #include "gltf_document_extension_physics.h" -#include "scene/3d/area_3d.h" +#include "scene/3d/physics/area_3d.h" +#include "scene/3d/physics/static_body_3d.h" // Import process. Error GLTFDocumentExtensionPhysics::import_preflight(Ref p_state, Vector p_extensions) { diff --git a/modules/gltf/extensions/physics/gltf_physics_body.cpp b/modules/gltf/extensions/physics/gltf_physics_body.cpp index 271bb9b332..7929b46542 100644 --- a/modules/gltf/extensions/physics/gltf_physics_body.cpp +++ b/modules/gltf/extensions/physics/gltf_physics_body.cpp @@ -30,8 +30,11 @@ #include "gltf_physics_body.h" -#include "scene/3d/area_3d.h" -#include "scene/3d/vehicle_body_3d.h" +#include "scene/3d/physics/animatable_body_3d.h" +#include "scene/3d/physics/area_3d.h" +#include "scene/3d/physics/character_body_3d.h" +#include "scene/3d/physics/static_body_3d.h" +#include "scene/3d/physics/vehicle_body_3d.h" void GLTFPhysicsBody::_bind_methods() { ClassDB::bind_static_method("GLTFPhysicsBody", D_METHOD("from_node", "body_node"), &GLTFPhysicsBody::from_node); diff --git a/modules/gltf/extensions/physics/gltf_physics_body.h b/modules/gltf/extensions/physics/gltf_physics_body.h index 6b21639a7b..ec139054ff 100644 --- a/modules/gltf/extensions/physics/gltf_physics_body.h +++ b/modules/gltf/extensions/physics/gltf_physics_body.h @@ -31,7 +31,7 @@ #ifndef GLTF_PHYSICS_BODY_H #define GLTF_PHYSICS_BODY_H -#include "scene/3d/physics_body_3d.h" +#include "scene/3d/physics/physics_body_3d.h" // GLTFPhysicsBody is an intermediary between Godot's physics body nodes // and the OMI_physics_body extension. diff --git a/modules/gltf/extensions/physics/gltf_physics_shape.cpp b/modules/gltf/extensions/physics/gltf_physics_shape.cpp index 467499a03f..35c99adbe5 100644 --- a/modules/gltf/extensions/physics/gltf_physics_shape.cpp +++ b/modules/gltf/extensions/physics/gltf_physics_shape.cpp @@ -33,7 +33,7 @@ #include "../../gltf_state.h" #include "core/math/convex_hull.h" -#include "scene/3d/area_3d.h" +#include "scene/3d/physics/area_3d.h" #include "scene/resources/3d/box_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h" diff --git a/modules/gltf/extensions/physics/gltf_physics_shape.h b/modules/gltf/extensions/physics/gltf_physics_shape.h index 4f7ac39292..ec0a8931f1 100644 --- a/modules/gltf/extensions/physics/gltf_physics_shape.h +++ b/modules/gltf/extensions/physics/gltf_physics_shape.h @@ -33,7 +33,7 @@ #include "../../gltf_defines.h" -#include "scene/3d/collision_shape_3d.h" +#include "scene/3d/physics/collision_shape_3d.h" class ImporterMesh; diff --git a/modules/navigation/2d/nav_mesh_generator_2d.cpp b/modules/navigation/2d/nav_mesh_generator_2d.cpp index 9fdfb20842..d1ac784103 100644 --- a/modules/navigation/2d/nav_mesh_generator_2d.cpp +++ b/modules/navigation/2d/nav_mesh_generator_2d.cpp @@ -35,7 +35,7 @@ #include "core/config/project_settings.h" #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/multimesh_instance_2d.h" -#include "scene/2d/physics_body_2d.h" +#include "scene/2d/physics/static_body_2d.h" #include "scene/2d/polygon_2d.h" #include "scene/2d/tile_map.h" #include "scene/resources/2d/capsule_shape_2d.h" diff --git a/modules/navigation/3d/nav_mesh_generator_3d.cpp b/modules/navigation/3d/nav_mesh_generator_3d.cpp index 4cd4f60edc..e1ed9c51aa 100644 --- a/modules/navigation/3d/nav_mesh_generator_3d.cpp +++ b/modules/navigation/3d/nav_mesh_generator_3d.cpp @@ -37,7 +37,7 @@ #include "core/os/thread.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/3d/multimesh_instance_3d.h" -#include "scene/3d/physics_body_3d.h" +#include "scene/3d/physics/static_body_3d.h" #include "scene/resources/3d/box_shape_3d.h" #include "scene/resources/3d/capsule_shape_3d.h" #include "scene/resources/3d/concave_polygon_shape_3d.h" -- cgit v1.2.3