Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-03 01:19:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved 2d shapes to core.

Browse Source
This commit is contained in:
Relintai 2023-12-10 20:03:16 +01:00
parent 9d2309bfe1
commit e32155717c
35 changed files with 54 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/scene/SCsub
View File

@ -4,4 +4,5 @@ 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, "resources/shapes/*.cpp")
env.add_source_files(env.core_sources, "resources/shapes_2d/*.cpp")
#env.add_source_files(env.core_sources, "*.cpp") #env.add_source_files(env.core_sources, "*.cpp")

0
scene/resources/shapes_2d/capsule_shape_2d.cpp → core/scene/resources/shapes_2d/capsule_shape_2d.cpp
View File

2
scene/resources/shapes_2d/capsule_shape_2d.h → core/scene/resources/shapes_2d/capsule_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class CapsuleShape2D : public Shape2D { class CapsuleShape2D : public Shape2D {
GDCLASS(CapsuleShape2D, Shape2D); GDCLASS(CapsuleShape2D, Shape2D);

0
scene/resources/shapes_2d/circle_shape_2d.cpp → core/scene/resources/shapes_2d/circle_shape_2d.cpp
View File

2
scene/resources/shapes_2d/circle_shape_2d.h → core/scene/resources/shapes_2d/circle_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class CircleShape2D : public Shape2D { class CircleShape2D : public Shape2D {
GDCLASS(CircleShape2D, Shape2D); GDCLASS(CircleShape2D, Shape2D);

0
scene/resources/shapes_2d/concave_polygon_shape_2d.cpp → core/scene/resources/shapes_2d/concave_polygon_shape_2d.cpp
View File

2
scene/resources/shapes_2d/concave_polygon_shape_2d.h → core/scene/resources/shapes_2d/concave_polygon_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class ConcavePolygonShape2D : public Shape2D { class ConcavePolygonShape2D : public Shape2D {
GDCLASS(ConcavePolygonShape2D, Shape2D); GDCLASS(ConcavePolygonShape2D, Shape2D);

0
scene/resources/shapes_2d/convex_polygon_shape_2d.cpp → core/scene/resources/shapes_2d/convex_polygon_shape_2d.cpp
View File

2
scene/resources/shapes_2d/convex_polygon_shape_2d.h → core/scene/resources/shapes_2d/convex_polygon_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class ConvexPolygonShape2D : public Shape2D { class ConvexPolygonShape2D : public Shape2D {
GDCLASS(ConvexPolygonShape2D, Shape2D); GDCLASS(ConvexPolygonShape2D, Shape2D);

0
scene/resources/shapes_2d/line_shape_2d.cpp → core/scene/resources/shapes_2d/line_shape_2d.cpp
View File

2
scene/resources/shapes_2d/line_shape_2d.h → core/scene/resources/shapes_2d/line_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class LineShape2D : public Shape2D { class LineShape2D : public Shape2D {
GDCLASS(LineShape2D, Shape2D); GDCLASS(LineShape2D, Shape2D);

0
scene/resources/shapes_2d/rectangle_shape_2d.cpp → core/scene/resources/shapes_2d/rectangle_shape_2d.cpp
View File

2
scene/resources/shapes_2d/rectangle_shape_2d.h → core/scene/resources/shapes_2d/rectangle_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class RectangleShape2D : public Shape2D { class RectangleShape2D : public Shape2D {
GDCLASS(RectangleShape2D, Shape2D); GDCLASS(RectangleShape2D, Shape2D);

0
scene/resources/shapes_2d/segment_shape_2d.cpp → core/scene/resources/shapes_2d/segment_shape_2d.cpp
View File

2
scene/resources/shapes_2d/segment_shape_2d.h → core/scene/resources/shapes_2d/segment_shape_2d.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_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class SegmentShape2D : public Shape2D { class SegmentShape2D : public Shape2D {
GDCLASS(SegmentShape2D, Shape2D); GDCLASS(SegmentShape2D, Shape2D);

0
scene/resources/shapes_2d/shape_2d.cpp → core/scene/resources/shapes_2d/shape_2d.cpp
View File

0
scene/resources/shapes_2d/shape_2d.h → core/scene/resources/shapes_2d/shape_2d.h
View File

16
editor/plugins/collision_shape_2d_editor_plugin.cpp
View File

@ -44,14 +44,14 @@
#include "scene/2d/collision_shape_2d.h" #include "scene/2d/collision_shape_2d.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/line_shape_2d.h" #include "core/scene/resources/shapes_2d/line_shape_2d.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/segment_shape_2d.h" #include "core/scene/resources/shapes_2d/segment_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
void CollisionShape2DEditor::_node_removed(Node *p_node) { void CollisionShape2DEditor::_node_removed(Node *p_node) {

12
modules/navigation_geometry_parsers/geometry_parser_2d/staticbody2d_navigation_geometry_parser_2d.cpp
View File

@ -33,12 +33,12 @@
#include "core/math/convex_hull.h" #include "core/math/convex_hull.h"
#include "scene/2d/mesh_instance_2d.h" #include "scene/2d/mesh_instance_2d.h"
#include "scene/2d/physics_body_2d.h" #include "scene/2d/physics_body_2d.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/navigation_2d/navigation_mesh_source_geometry_data_2d.h"
#include "scene/resources/navigation_2d/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"

2
modules/props_2d/prop_2d_instance_merger.h
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "prop_2d_instance.h" #include "prop_2d_instance.h"
#include "scene/main/node_2d.h" #include "scene/main/node_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "core/math/vector3.h" #include "core/math/vector3.h"

2
modules/props_2d/prop_2d_instance_prop_job.h
View File

@ -24,7 +24,7 @@ SOFTWARE.
#include "prop_2d_instance_job.h" #include "prop_2d_instance_job.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h"

2
modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.cpp
View File

@ -25,7 +25,7 @@ SOFTWARE.
#include "core/math/math_funcs.h" #include "core/math/math_funcs.h"
#include "../../library/terrain_2d_material_cache.h" #include "../../library/terrain_2d_material_cache.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
void Terrain2DMesherIsometric::_add_chunk(Ref<Terrain2DChunk> p_chunk) { void Terrain2DMesherIsometric::_add_chunk(Ref<Terrain2DChunk> p_chunk) {
Ref<Terrain2DChunkDefault> chunk = p_chunk; Ref<Terrain2DChunkDefault> chunk = p_chunk;

2
modules/terraman_2d/meshers/terrain_2d_mesher.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE.
#include "../world/default/terrain_2d_chunk_default.h" #include "../world/default/terrain_2d_chunk_default.h"
#include "../world/terrain_2d_chunk.h" #include "../world/terrain_2d_chunk.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "core/servers/physics_2d/physics_2d_server.h" #include "core/servers/physics_2d/physics_2d_server.h"
#include "modules/modules_enabled.gen.h" #include "modules/modules_enabled.gen.h"

2
modules/terraman_2d/meshers/terrain_2d_mesher.h
View File

@ -44,7 +44,7 @@ SOFTWARE.
#include "../../mesh_data_resource/mesh_data_resource.h" #include "../../mesh_data_resource/mesh_data_resource.h"
#endif #endif
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "../library/terrain_2d_library.h" #include "../library/terrain_2d_library.h"

2
modules/terraman_2d/world/terrain_2d_chunk.h
View File

@ -49,7 +49,7 @@ SOFTWARE.
#include "../../props_2d/props/prop_2d_data.h" #include "../../props_2d/props/prop_2d_data.h"
#endif #endif
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "../library/terrain_2d_library.h" #include "../library/terrain_2d_library.h"
#include "../library/terrain_2d_surface.h" #include "../library/terrain_2d_surface.h"

4
modules/tile_map/tile_set.h
View File

@ -36,9 +36,9 @@
#include "core/variant/array.h" #include "core/variant/array.h"
#include "scene/2d/light_occluder_2d.h" #include "scene/2d/light_occluder_2d.h"
#include "scene/2d/navigation_polygon_instance.h" #include "scene/2d/navigation_polygon_instance.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/navigation_2d/navigation_polygon.h" #include "scene/resources/navigation_2d/navigation_polygon.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
class TileSet : public Resource { class TileSet : public Resource {

4
modules/tile_map/tile_set_editor_plugin.h
View File

@ -32,8 +32,8 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "scene/2d/sprite.h" #include "scene/2d/sprite.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "tile_set.h" #include "tile_set.h"
#define WORKSPACE_MARGIN Vector2(10, 10) #define WORKSPACE_MARGIN Vector2(10, 10)

2
scene/2d/collision_object_2d.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/ /*************************************************************************/
#include "scene/main/node_2d.h" #include "scene/main/node_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
class CollisionObject2D : public Node2D { class CollisionObject2D : public Node2D {
GDCLASS(CollisionObject2D, Node2D); GDCLASS(CollisionObject2D, Node2D);

6
scene/2d/collision_polygon_2d.cpp
View File

@ -33,9 +33,9 @@
#include "collision_object_2d.h" #include "collision_object_2d.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/2d/area_2d.h" #include "scene/2d/area_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "thirdparty/misc/triangulator.h" #include "thirdparty/misc/triangulator.h"

16
scene/2d/collision_shape_2d.cpp
View File

@ -33,14 +33,14 @@
#include "collision_object_2d.h" #include "collision_object_2d.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/2d/area_2d.h" #include "scene/2d/area_2d.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "scene/resources/shapes_2d/concave_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h" #include "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/line_shape_2d.h" #include "core/scene/resources/shapes_2d/line_shape_2d.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/shapes_2d/segment_shape_2d.h" #include "core/scene/resources/shapes_2d/segment_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
void CollisionShape2D::_shape_changed() { void CollisionShape2D::_shape_changed() {
update(); update();

2
scene/2d/shape_cast_2d.cpp
View File

@ -34,7 +34,7 @@
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/2d/collision_object_2d.h" #include "scene/2d/collision_object_2d.h"
#include "scene/2d/physics_body_2d.h" #include "scene/2d/physics_body_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "core/servers/physics_2d/physics_2d_server.h" #include "core/servers/physics_2d/physics_2d_server.h"
void ShapeCast2D::set_target_position(const Vector2 &p_point) { void ShapeCast2D::set_target_position(const Vector2 &p_point) {

2
scene/2d/shape_cast_2d.h
View File

@ -32,7 +32,7 @@
#define SHAPE_CAST_2D_H #define SHAPE_CAST_2D_H
#include "scene/main/node_2d.h" #include "scene/main/node_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h" #include "core/scene/resources/shapes_2d/shape_2d.h"
#include "scene/resources/world_2d.h" #include "scene/resources/world_2d.h"
class CollisionObject2D; class CollisionObject2D;

2
scene/2d/touch_screen_button.cpp
View File

@ -34,7 +34,7 @@
#include "core/input/input.h" #include "core/input/input.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/scene/resources/bit_map.h" #include "core/scene/resources/bit_map.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/scene/resources/shapes_2d/rectangle_shape_2d.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "scene/main/scene_string_names.h" #include "scene/main/scene_string_names.h"

14
scene/register_scene_types.cpp
View File

@ -142,19 +142,19 @@
#include "core/scene/resources/bit_map.h" #include "core/scene/resources/bit_map.h"
#include "core/scene/resources/shapes/box_shape.h" #include "core/scene/resources/shapes/box_shape.h"
#include "core/scene/resources/shapes/capsule_shape.h" #include "core/scene/resources/shapes/capsule_shape.h"
#include "scene/resources/shapes_2d/capsule_shape_2d.h" #include "core/scene/resources/shapes_2d/capsule_shape_2d.h"
#include "scene/resources/shapes_2d/circle_shape_2d.h" #include "core/scene/resources/shapes_2d/circle_shape_2d.h"
#include "core/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 "core/scene/resources/shapes_2d/concave_polygon_shape_2d.h"
#include "core/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 "core/scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "core/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 "core/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 "core/scene/resources/shapes_2d/line_shape_2d.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/mesh/mesh_data_tool.h" #include "scene/resources/mesh/mesh_data_tool.h"
@ -170,9 +170,9 @@
#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 "core/scene/resources/shapes/ray_shape.h" #include "core/scene/resources/shapes/ray_shape.h"
#include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "core/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 "core/scene/resources/shapes_2d/segment_shape_2d.h"
#include "scene/resources/sky.h" #include "scene/resources/sky.h"
#include "core/scene/resources/shapes/sphere_shape.h" #include "core/scene/resources/shapes/sphere_shape.h"

7
scene/resources/SCsub
View File

@ -18,13 +18,6 @@ env.scene_sources += thirdparty_obj
scene_obj = [] scene_obj = []
env.add_source_files(scene_obj, "*.cpp") env.add_source_files(scene_obj, "*.cpp")
# 2d shapes
shapes_2d_obj = []
env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp")
for o in shapes_2d_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")