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

Moved the Physics 2d server to core.

Browse Source
This commit is contained in:
Relintai 2023-12-10 19:42:57 +01:00
parent dbcc6e33da
commit 053f083e17
40 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/register_core_types.cpp
View File

@ -82,6 +82,7 @@
#include "core/servers/rendering/rendering_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
static Ref<ResourceFormatSaverBinary> resource_saver_binary;
static Ref<ResourceFormatLoaderBinary> resource_loader_binary;
@ -302,6 +303,7 @@ void register_core_singletons() {
ClassDB::register_class<_ScriptServer>();
ClassDB::register_virtual_class<RenderingServer>();
ClassDB::register_virtual_class<PhysicsServer>();
ClassDB::register_virtual_class<Physics2DServer>();
Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton()));
@ -322,6 +324,7 @@ void register_core_singletons() {
Engine::get_singleton()->add_singleton(Engine::Singleton("ScriptServer", _ScriptServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer", PhysicsServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
}
void unregister_core_types() {

1
core/servers/SCsub
View File

@ -4,4 +4,5 @@ Import("env")
env.add_source_files(env.core_sources, "rendering/*.cpp")
env.add_source_files(env.core_sources, "physics/*.cpp")
env.add_source_files(env.core_sources, "physics_2d/*.cpp")
#env.add_source_files(env.core_sources, "*.cpp")

0
servers/physics_2d_server.cpp → core/servers/physics_2d/physics_2d_server.cpp
View File

0
servers/physics_2d_server.h → core/servers/physics_2d/physics_2d_server.h
View File

2
editor/editor_node.cpp
View File

@ -188,7 +188,7 @@
#include "scene/resources/packed_scene.h"
#include "scene/resources/world_3d.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"

2
editor/project_manager.cpp
View File

@ -85,7 +85,7 @@
#include "scene/main/scene_tree.h"
#include "scene/resources/texture.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "thirdparty/minizip/ioapi.h"
#include "thirdparty/minizip/unzip.h"

2
main/main.cpp
View File

@ -67,7 +67,7 @@
#include "servers/navigation/navigation_mesh_generator_dummy.h"
#include "servers/navigation_2d_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "servers/register_server_types.h"
#include "core/servers/rendering/rendering_server_callbacks.h"

2
main/performance.cpp
View File

@ -36,7 +36,7 @@
#include "scene/main/scene_tree.h"
#include "servers/audio_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"

2
main/tests/test_physics_2d.cpp
View File

@ -35,7 +35,7 @@
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "scene/resources/texture.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
static const unsigned char convex_png[] = {

2
modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp
View File

@ -31,7 +31,7 @@ SOFTWARE.
#include "core/servers/rendering/rendering_server.h"
#include "scene/resources/world_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
_FORCE_INLINE_ int Terrain2DMesherDefault::get_build_flags() const {
return _build_flags;

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

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

2
modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp
View File

@ -40,7 +40,7 @@ SOFTWARE.
#include "../jobs/terrain_2d_terrain_job.h"
#include "scene/resources/world_3d.h"
#include "scene/resources/world_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider";

2
modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../meshers/terrain_2d_mesher.h"
#include "../default/terrain_2d_chunk_default.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/tile_map/tile_map.cpp
View File

@ -37,7 +37,7 @@
#include "scene/2d/collision_object_2d.h"
#include "scene/resources/world_2d.h"
#include "servers/navigation_2d_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "servers/rendering/rendering_server_canvas_helper.h"
#ifdef DEBUG_ENABLED

2
scene/2d/area_2d.cpp
View File

@ -32,7 +32,7 @@
#include "scene/resources/world_3d.h"
#include "scene/main/scene_string_names.h"
#include "servers/audio_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void Area2D::set_space_override_mode(SpaceOverride p_mode) {
space_override = p_mode;

2
scene/2d/audio_stream_player_2d.cpp
View File

@ -38,7 +38,7 @@
#include "scene/resources/world_2d.h"
#include "servers/audio/audio_stream.h"
#include "servers/audio_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void AudioStreamPlayer2D::_mix_audio() {
if (!stream_playback.is_valid() || !active.is_set() ||

2
scene/2d/collision_object_2d.cpp
View File

@ -32,7 +32,7 @@
#include "scene/resources/world_2d.h"
#include "scene/main/scene_string_names.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void CollisionObject2D::_notification(int p_what) {
switch (p_what) {

2
scene/2d/joints_2d.cpp
View File

@ -33,7 +33,7 @@
#include "core/config/engine.h"
#include "physics_body_2d.h"
#include "scene/main/scene_string_names.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void Joint2D::_disconnect_signals() {
Node *node_a = get_node_or_null(a);

2
scene/2d/physics_body_2d.cpp
View File

@ -40,7 +40,7 @@
#include "core/containers/rid.h"
#include "scene/resources/physics_material.h"
#include "scene/main/scene_string_names.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void PhysicsBody2D::_notification(int p_what) {
}

2
scene/2d/physics_body_2d.h
View File

@ -32,7 +32,7 @@
#include "core/containers/vset.h"
#include "scene/2d/collision_object_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
class PhysicsMaterial;
class KinematicCollision2D;

2
scene/2d/ray_cast_2d.cpp
View File

@ -34,7 +34,7 @@
#include "core/config/engine.h"
#include "physics_body_2d.h"
#include "scene/resources/world_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void RayCast2D::set_cast_to(const Vector2 &p_point) {
cast_to = p_point;

2
scene/2d/shape_cast_2d.cpp
View File

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

2
scene/main/scene_tree.cpp
View File

@ -53,7 +53,7 @@
#include "scene/main/scene_string_names.h"
#include "servers/audio_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "viewport.h"

2
scene/main/viewport.cpp
View File

@ -56,7 +56,7 @@
#include "scene/resources/world_2d.h"
#include "scene/resources/world_3d.h"
#include "scene/main/scene_string_names.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
void ViewportTexture::setup_local_to_scene() {
Node *local_scene = get_local_scene();

2
scene/resources/shapes_2d/capsule_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "capsule_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
Vector<Vector2> CapsuleShape2D::get_points() const {

2
scene/resources/shapes_2d/circle_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "circle_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
bool CircleShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {

2
scene/resources/shapes_2d/concave_polygon_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "concave_polygon_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {

2
scene/resources/shapes_2d/convex_polygon_shape_2d.cpp
View File

@ -31,7 +31,7 @@
#include "convex_polygon_shape_2d.h"
#include "core/math/geometry.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
bool ConvexPolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {

2
scene/resources/shapes_2d/line_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "line_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
bool LineShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {

2
scene/resources/shapes_2d/rectangle_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "rectangle_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
void RectangleShape2D::_update_shape() {
Physics2DServer::get_singleton()->shape_set_data(get_rid(), extents);

2
scene/resources/shapes_2d/segment_shape_2d.cpp
View File

@ -30,7 +30,7 @@
#include "segment_shape_2d.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {

2
scene/resources/shapes_2d/shape_2d.cpp
View File

@ -32,7 +32,7 @@
#include "core/config/engine.h"
#include "core/config/project_settings.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
RID Shape2D::get_rid() const {
return shape;

2
scene/resources/world_2d.cpp
View File

@ -36,7 +36,7 @@
#include "scene/main/viewport.h"
#include "scene/main/world.h"
#include "servers/navigation_2d_server.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/rendering/rendering_server.h"
struct SpatialIndexer2D {

2
scene/resources/world_2d.h
View File

@ -32,7 +32,7 @@
#include "core/config/project_settings.h"
#include "core/object/resource.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
class VisibilityNotifier2D;
class Viewport;

2
servers/physics_2d/area_2d_sw.h
View File

@ -32,7 +32,7 @@
#include "collision_object_2d_sw.h"
#include "core/containers/self_list.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
//#include "servers/physics/query_sw.h"
class Space2DSW;

2
servers/physics_2d/collision_object_2d_sw.h
View File

@ -32,7 +32,7 @@
#include "broad_phase_2d_sw.h"
#include "core/containers/self_list.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "shape_2d_sw.h"
class Space2DSW;

2
servers/physics_2d/physics_2d_server_sw.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/
#include "joints_2d_sw.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "shape_2d_sw.h"
#include "space_2d_sw.h"
#include "step_2d_sw.h"

2
servers/physics_2d/physics_2d_server_wrap_mt.h
View File

@ -34,7 +34,7 @@
#include "core/os/thread.h"
#include "core/config/project_settings.h"
#include "core/os/safe_refcount.h"
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#ifdef DEBUG_SYNC
#define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));

2
servers/physics_2d/shape_2d_sw.h
View File

@ -30,7 +30,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "servers/physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#define _SEGMENT_IS_VALID_SUPPORT_THRESHOLD 0.99998
/*

4
servers/register_server_types.cpp
View File

@ -62,7 +62,7 @@
#include "physics/physics_server_sw.h"
#include "physics_2d/physics_2d_server_sw.h"
#include "physics_2d/physics_2d_server_wrap_mt.h"
#include "physics_2d_server.h"
#include "core/servers/physics_2d/physics_2d_server.h"
#include "core/servers/physics/physics_server.h"
#include "rendering/shader_types.h"
#include "scene/debugger/script_debugger_remote.h"
@ -100,7 +100,6 @@ Physics2DServer *_createPandemoniumPhysics2DCallback() {
void register_server_types() {
ClassDB::register_class<AudioServer>();
ClassDB::register_virtual_class<Physics2DServer>();
ClassDB::register_virtual_class<NavigationServer>();
ClassDB::register_virtual_class<Navigation2DServer>();
//ClassDB::register_class<NavigationMeshGeneratorManager>();
@ -209,7 +208,6 @@ void unregister_server_types() {
void register_server_singletons() {
Engine::get_singleton()->add_singleton(Engine::Singleton("AudioServer", AudioServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("Physics2DServer", Physics2DServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer", NavigationServer::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("Navigation2DServer", Navigation2DServer::get_singleton()));
}