Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 20:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved shapes to core.

Browse Source
This commit is contained in:
Relintai 2023-12-10 19:58:44 +01:00
parent 053f083e17
commit 9d2309bfe1
55 changed files with 104 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/scene/SCsub
View File

@ -3,4 +3,5 @@
Import("env") Import("env")
env.add_source_files(env.core_sources, "resources/*.cpp") env.add_source_files(env.core_sources, "resources/*.cpp")
env.add_source_files(env.core_sources, "resources/shapes/*.cpp")
#env.add_source_files(env.core_sources, "*.cpp") #env.add_source_files(env.core_sources, "*.cpp")

0
scene/resources/shapes/box_shape.cpp → core/scene/resources/shapes/box_shape.cpp
View File

2
scene/resources/shapes/box_shape.h → core/scene/resources/shapes/box_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class BoxShape : public Shape { class BoxShape : public Shape {
GDCLASS(BoxShape, Shape); GDCLASS(BoxShape, Shape);

0
scene/resources/shapes/capsule_shape.cpp → core/scene/resources/shapes/capsule_shape.cpp
View File

2
scene/resources/shapes/capsule_shape.h → core/scene/resources/shapes/capsule_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class CapsuleShape : public Shape { class CapsuleShape : public Shape {
GDCLASS(CapsuleShape, Shape); GDCLASS(CapsuleShape, Shape);

0
scene/resources/shapes/concave_polygon_shape.cpp → core/scene/resources/shapes/concave_polygon_shape.cpp
View File

2
scene/resources/shapes/concave_polygon_shape.h → core/scene/resources/shapes/concave_polygon_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class ConcavePolygonShape : public Shape { class ConcavePolygonShape : public Shape {
GDCLASS(ConcavePolygonShape, Shape); GDCLASS(ConcavePolygonShape, Shape);

0
scene/resources/shapes/convex_polygon_shape.cpp → core/scene/resources/shapes/convex_polygon_shape.cpp
View File

2
scene/resources/shapes/convex_polygon_shape.h → core/scene/resources/shapes/convex_polygon_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class ConvexPolygonShape : public Shape { class ConvexPolygonShape : public Shape {
GDCLASS(ConvexPolygonShape, Shape); GDCLASS(ConvexPolygonShape, Shape);

0
scene/resources/shapes/cylinder_shape.cpp → core/scene/resources/shapes/cylinder_shape.cpp
View File

2
scene/resources/shapes/cylinder_shape.h → core/scene/resources/shapes/cylinder_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class CylinderShape : public Shape { class CylinderShape : public Shape {
GDCLASS(CylinderShape, Shape); GDCLASS(CylinderShape, Shape);

0
scene/resources/shapes/height_map_shape.cpp → core/scene/resources/shapes/height_map_shape.cpp
View File

2
scene/resources/shapes/height_map_shape.h → core/scene/resources/shapes/height_map_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class HeightMapShape : public Shape { class HeightMapShape : public Shape {
GDCLASS(HeightMapShape, Shape); GDCLASS(HeightMapShape, Shape);

0
scene/resources/shapes/plane_shape.cpp → core/scene/resources/shapes/plane_shape.cpp
View File

2
scene/resources/shapes/plane_shape.h → core/scene/resources/shapes/plane_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class PlaneShape : public Shape { class PlaneShape : public Shape {
GDCLASS(PlaneShape, Shape); GDCLASS(PlaneShape, Shape);

0
scene/resources/shapes/ray_shape.cpp → core/scene/resources/shapes/ray_shape.cpp
View File

2
scene/resources/shapes/ray_shape.h → core/scene/resources/shapes/ray_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class RayShape : public Shape { class RayShape : public Shape {
GDCLASS(RayShape, Shape); GDCLASS(RayShape, Shape);

0
scene/resources/shapes/shape.cpp → core/scene/resources/shapes/shape.cpp
View File

0
scene/resources/shapes/shape.h → core/scene/resources/shapes/shape.h
View File

0
scene/resources/shapes/sphere_shape.cpp → core/scene/resources/shapes/sphere_shape.cpp
View File

2
scene/resources/shapes/sphere_shape.h → core/scene/resources/shapes/sphere_shape.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class SphereShape : public Shape { class SphereShape : public Shape {
GDCLASS(SphereShape, Shape); GDCLASS(SphereShape, Shape);

10
editor/import/resource_importer_scene.cpp
View File

@ -41,15 +41,15 @@
#include "scene/3d/vehicle_body.h" #include "scene/3d/vehicle_body.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/animation/animation.h" #include "scene/animation/animation.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/ray_shape.h" #include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/resource_format_text.h" #include "scene/resources/resource_format_text.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
uint32_t EditorSceneImporter::get_import_flags() const { uint32_t EditorSceneImporter::get_import_flags() const {
if (get_script_instance()) { if (get_script_instance()) {

2
editor/plugins/mesh_instance_editor_plugin.cpp
View File

@ -61,7 +61,7 @@
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "spatial_editor_plugin.h" #include "spatial_editor_plugin.h"
void MeshInstanceEditor::_node_removed(Node *p_node) { void MeshInstanceEditor::_node_removed(Node *p_node) {

2
editor/plugins/spatial_editor_plugin.cpp
View File

@ -93,7 +93,7 @@
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/style_box.h" #include "scene/resources/style_box.h"
#include "scene/resources/mesh/surface_tool.h" #include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"

20
editor/spatial_editor_gizmos.cpp
View File

@ -86,21 +86,21 @@
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/main/timer.h" #include "scene/main/timer.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h" #include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/material/material.h" #include "scene/resources/material/material.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/occluder_shape.h" #include "scene/resources/occluder_shape.h"
#include "scene/resources/occluder_shape_polygon.h" #include "scene/resources/occluder_shape_polygon.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/mesh/primitive_meshes.h"
#include "scene/resources/shapes/ray_shape.h" #include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/mesh/surface_tool.h" #include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "servers/navigation_server.h" #include "servers/navigation_server.h"

12
editor_modules/gltf/extensions/physics/gltf_collider.cpp
View File

@ -33,12 +33,12 @@
#include "../../gltf_state.h" #include "../../gltf_state.h"
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "scene/3d/area.h" #include "scene/3d/area.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
void GLTFCollider::_bind_methods() { void GLTFCollider::_bind_methods() {
ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false)); ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false));

2
modules/csg/csg_shape.h
View File

@ -36,7 +36,7 @@
#include "csg.h" #include "csg.h"
#include "scene/3d/path.h" #include "scene/3d/path.h"
#include "scene/3d/visual_instance.h" #include "scene/3d/visual_instance.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "thirdparty/misc/mikktspace.h" #include "thirdparty/misc/mikktspace.h"
class CSGShape : public GeometryInstance { class CSGShape : public GeometryInstance {

18
modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
View File

@ -35,18 +35,18 @@
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "scene/3d/physics_body.h" #include "scene/3d/physics_body.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h" #include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/mesh/primitive_meshes.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) { bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) {
return (Object::cast_to<GridMap>(p_node) != nullptr); return (Object::cast_to<GridMap>(p_node) != nullptr);

2
modules/gridmap/mesh_library.cpp
View File

@ -30,7 +30,7 @@
#include "mesh_library.h" #include "mesh_library.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
MeshLibrary::Item::Item() { MeshLibrary::Item::Item() {

2
modules/gridmap/mesh_library.h
View File

@ -35,7 +35,7 @@
#include "core/object/resource.h" #include "core/object/resource.h"
#include "scene/3d/navigation_mesh_instance.h" #include "scene/3d/navigation_mesh_instance.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class NavigationMesh; class NavigationMesh;

2
modules/mesh_data_resource/mesh_data_resource.h
View File

@ -29,7 +29,7 @@ SOFTWARE.
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class MeshDataResource : public Resource { class MeshDataResource : public Resource {
GDCLASS(MeshDataResource, Resource); GDCLASS(MeshDataResource, Resource);

14
modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp
View File

@ -22,13 +22,13 @@ SOFTWARE.
#include "mdr_import_plugin_base.h" #include "mdr_import_plugin_base.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h"

18
modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
View File

@ -33,16 +33,16 @@
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "scene/3d/physics_body.h" #include "scene/3d/physics_body.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/shapes/height_map_shape.h" #include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/mesh/primitive_meshes.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"
#include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h" #include "scene/resources/navigation/navigation_mesh_source_geometry_data_3d.h"

2
modules/props/prop_instance_merger.cpp
View File

@ -48,7 +48,7 @@
#include "tiled_wall/tiled_wall_data.h" #include "tiled_wall/tiled_wall_data.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2; const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2;

2
modules/props/prop_instance_prop_job.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE.
#include "prop_instance.h" #include "prop_instance.h"
#include "prop_instance_merger.h" #include "prop_instance_merger.h"
#include "prop_mesher.h" #include "prop_mesher.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h" #include "core/servers/physics/physics_server.h"
#include "singleton/prop_cache.h" #include "singleton/prop_cache.h"

2
modules/props_2d/prop_2d_instance_merger.cpp
View File

@ -45,7 +45,7 @@
#include "tiled_wall/tiled_wall_2d_data.h" #include "tiled_wall/tiled_wall_2d_data.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
bool Prop2DInstanceMerger::get_building() { bool Prop2DInstanceMerger::get_building() {
return _building; return _building;

2
modules/props_2d/prop_2d_instance_prop_job.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "prop_2d_instance.h" #include "prop_2d_instance.h"
#include "prop_2d_instance_merger.h" #include "prop_2d_instance_merger.h"
#include "prop_2d_mesher.h" #include "prop_2d_mesher.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "singleton/prop_2d_cache.h" #include "singleton/prop_2d_cache.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h"

4
modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
View File

@ -55,8 +55,8 @@
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/mesh/surface_tool.h" #include "scene/resources/mesh/surface_tool.h"
#include "physical_bone_editor_plugin.h" #include "physical_bone_editor_plugin.h"

2
scene/3d/area.cpp
View File

@ -29,7 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "area.h" #include "area.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/main/scene_string_names.h" #include "scene/main/scene_string_names.h"
#include "servers/audio_server.h" #include "servers/audio_server.h"
#include "core/servers/physics/physics_server.h" #include "core/servers/physics/physics_server.h"

2
scene/3d/audio_stream_player_3d.cpp
View File

@ -36,7 +36,7 @@
#include "scene/3d/listener.h" #include "scene/3d/listener.h"
#include "scene/3d/spatial_velocity_tracker.h" #include "scene/3d/spatial_velocity_tracker.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"
#include "core/servers/physics/physics_server.h" #include "core/servers/physics/physics_server.h"

2
scene/3d/collision_object.h
View File

@ -32,7 +32,7 @@
#include "core/object/reference.h" #include "core/object/reference.h"
#include "scene/main/spatial.h" #include "scene/main/spatial.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
class CollisionObject : public Spatial { class CollisionObject : public Spatial {
GDCLASS(CollisionObject, Spatial); GDCLASS(CollisionObject, Spatial);

6
scene/3d/collision_polygon.cpp
View File

@ -32,9 +32,9 @@
#include "collision_object.h" #include "collision_object.h"
#include "core/math/geometry.h" #include "core/math/geometry.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
void CollisionPolygon::_build_polygon() { void CollisionPolygon::_build_polygon() {
if (!parent) { if (!parent) {

16
scene/3d/collision_shape.cpp
View File

@ -33,15 +33,15 @@
#include "core/math/quick_hull.h" #include "core/math/quick_hull.h"
#include "mesh_instance.h" #include "mesh_instance.h"
#include "physics_body.h" #include "physics_body.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/shapes/ray_shape.h" #include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "core/servers/rendering/rendering_server.h" #include "core/servers/rendering/rendering_server.h"
void CollisionShape::make_convex_from_brothers() { void CollisionShape::make_convex_from_brothers() {

2
scene/3d/navigation_obstacle.cpp
View File

@ -37,7 +37,7 @@
#include "scene/main/spatial.h" #include "scene/main/spatial.h"
#include "scene/resources/material/material.h" #include "scene/resources/material/material.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "servers/navigation_server.h" #include "servers/navigation_server.h"
#include "core/servers/rendering/rendering_server.h" #include "core/servers/rendering/rendering_server.h"

2
scene/3d/physics_joint.cpp
View File

@ -31,7 +31,7 @@
#include "physics_joint.h" #include "physics_joint.h"
#include "scene/3d/physics_body.h" #include "scene/3d/physics_body.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/main/scene_string_names.h" #include "scene/main/scene_string_names.h"
void Joint::_disconnect_signals() { void Joint::_disconnect_signals() {

2
scene/3d/shape_cast.cpp
View File

@ -33,7 +33,7 @@
#include "collision_object.h" #include "collision_object.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "mesh_instance.h" #include "mesh_instance.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/material/material.h" #include "scene/resources/material/material.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"

2
scene/3d/shape_cast.h
View File

@ -34,7 +34,7 @@
#include "core/math/color.h" #include "core/math/color.h"
#include "scene/main/spatial.h" #include "scene/main/spatial.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "core/servers/physics/physics_server.h" #include "core/servers/physics/physics_server.h"
class SpatialMaterial; class SpatialMaterial;

4
scene/3d/spring_arm.cpp
View File

@ -31,8 +31,8 @@
#include "spring_arm.h" #include "spring_arm.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/3d/collision_object.h" #include "scene/3d/collision_object.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "core/servers/physics/physics_server.h" #include "core/servers/physics/physics_server.h"

2
scene/3d/vehicle_body.cpp
View File

@ -30,7 +30,7 @@
#include "vehicle_body.h" #include "vehicle_body.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#define ROLLING_INFLUENCE_FIX #define ROLLING_INFLUENCE_FIX

2
scene/3d/visibility_notifier.cpp
View File

@ -35,7 +35,7 @@
#include "scene/3d/physics_body.h" #include "scene/3d/physics_body.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/animation/animation_tree.h" #include "scene/animation/animation_tree.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h" #include "scene/resources/world_3d.h"
#include "scene/main/scene_string_names.h" #include "scene/main/scene_string_names.h"

18
scene/register_scene_types.cpp
View File

@ -140,19 +140,19 @@
#include "scene/main/world.h" #include "scene/main/world.h"
#include "scene/audio/audio_stream_sample.h" #include "scene/audio/audio_stream_sample.h"
#include "core/scene/resources/bit_map.h" #include "core/scene/resources/bit_map.h"
#include "scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes/cylinder_shape.h" #include "core/scene/resources/shapes/cylinder_shape.h"
#include "scene/resources/default_theme/default_theme.h" #include "scene/resources/default_theme/default_theme.h"
#include "scene/resources/font/dynamic_font.h" #include "scene/resources/font/dynamic_font.h"
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/shapes/height_map_shape.h" #include "core/scene/resources/shapes/height_map_shape.h"
#include "scene/resources/mesh/immediate_mesh.h" #include "scene/resources/mesh/immediate_mesh.h"
#include "scene/resources/shapes_2d/line_shape_2d.h" #include "scene/resources/shapes_2d/line_shape_2d.h"
#include "scene/resources/material/material.h" #include "scene/resources/material/material.h"
@ -166,16 +166,16 @@
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/material/particles_material.h" #include "scene/resources/material/particles_material.h"
#include "scene/resources/physics_material.h" #include "scene/resources/physics_material.h"
#include "scene/resources/shapes/plane_shape.h" #include "core/scene/resources/shapes/plane_shape.h"
#include "scene/resources/mesh/polygon_path_finder.h" #include "scene/resources/mesh/polygon_path_finder.h"
#include "scene/resources/mesh/primitive_meshes.h" #include "scene/resources/mesh/primitive_meshes.h"
#include "scene/resources/shapes/ray_shape.h" #include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/resource_format_text.h" #include "scene/resources/resource_format_text.h"
#include "scene/resources/shapes_2d/segment_shape_2d.h" #include "scene/resources/shapes_2d/segment_shape_2d.h"
#include "scene/resources/sky.h" #include "scene/resources/sky.h"
#include "scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"
#include "scene/resources/mesh/surface_tool.h" #include "scene/resources/mesh/surface_tool.h"
#include "scene/gui/resources/syntax_highlighter.h" #include "scene/gui/resources/syntax_highlighter.h"
#include "scene/resources/text_file.h" #include "scene/resources/text_file.h"

7
scene/resources/SCsub
View File

@ -25,13 +25,6 @@ env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp")
for o in shapes_2d_obj: for o in shapes_2d_obj:
scene_obj.append(o) scene_obj.append(o)
# 3d shapes
shapes_3d_obj = []
env.add_source_files(shapes_3d_obj, "shapes/*.cpp")
for o in shapes_3d_obj:
scene_obj.append(o)
# 2d navigation # 2d navigation
navigation_2d_obj = [] navigation_2d_obj = []
env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp") env.add_source_files(navigation_2d_obj, "navigation_2d/*.cpp")

4
scene/resources/mesh/importer_mesh.h
View File

@ -33,8 +33,8 @@
#include "core/object/resource.h" #include "core/object/resource.h"
#include "core/containers/local_vector.h" #include "core/containers/local_vector.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "scene/resources/navigation/navigation_mesh.h" #include "scene/resources/navigation/navigation_mesh.h"

4
scene/resources/mesh/mesh.cpp
View File

@ -34,8 +34,8 @@
#include "core/containers/local_vector.h" #include "core/containers/local_vector.h"
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "core/containers/pair.h" #include "core/containers/pair.h"
#include "scene/resources/shapes/concave_polygon_shape.h" #include "core/scene/resources/shapes/concave_polygon_shape.h"
#include "scene/resources/shapes/convex_polygon_shape.h" #include "core/scene/resources/shapes/convex_polygon_shape.h"
#include "surface_tool.h" #include "surface_tool.h"
#include <stdlib.h> #include <stdlib.h>

2
scene/resources/mesh/mesh.h
View File

@ -35,7 +35,7 @@
#include "core/object/resource.h" #include "core/object/resource.h"
#include "scene/resources/material/material.h" #include "scene/resources/material/material.h"
#include "scene/resources/shapes/shape.h" #include "core/scene/resources/shapes/shape.h"
#include "core/servers/rendering/rendering_server.h" #include "core/servers/rendering/rendering_server.h"
class Mesh : public Resource { class Mesh : public Resource {