Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-24 04:46:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved the physics server to core.

Browse Source
This commit is contained in:
Relintai 2023-12-10 19:36:00 +01:00
parent 238bf1b331
commit dbcc6e33da
59 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/register_core_types.cpp
View File

@ -81,6 +81,7 @@
#include "core/log/logger_backend.h"
#include "core/servers/rendering/rendering_server.h"
#include "core/servers/physics/physics_server.h"
static Ref<ResourceFormatSaverBinary> resource_saver_binary;
static Ref<ResourceFormatLoaderBinary> resource_loader_binary;
@ -300,6 +301,7 @@ void register_core_singletons() {
ClassDB::register_class<ThreadPool>();
ClassDB::register_class<_ScriptServer>();
ClassDB::register_virtual_class<RenderingServer>();
ClassDB::register_virtual_class<PhysicsServer>();
Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton()));
@ -319,6 +321,7 @@ void register_core_singletons() {
Engine::get_singleton()->add_singleton(Engine::Singleton("ThreadPool", ThreadPool::get_singleton()));
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()));
}
void unregister_core_types() {

1
core/servers/SCsub
View File

@ -3,4 +3,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, "*.cpp")

0
servers/physics_server.cpp → core/servers/physics/physics_server.cpp
View File

0
servers/physics_server.h → core/servers/physics/physics_server.h
View File

2
editor/editor_node.cpp
View File

@ -189,7 +189,7 @@
#include "scene/resources/world_3d.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "modules/modules_enabled.gen.h"

2
editor/plugins/spatial_editor_plugin.cpp
View File

@ -97,7 +97,7 @@
#include "scene/resources/style_box.h"
#include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
editor/project_manager.cpp
View File

@ -86,7 +86,7 @@
#include "scene/resources/texture.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_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

@ -68,7 +68,7 @@
#include "servers/navigation_2d_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_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

@ -37,7 +37,7 @@
#include "servers/audio_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
Performance *Performance::singleton = nullptr;

2
main/tests/test_physics.cpp
View File

@ -36,7 +36,7 @@
#include "core/os/main_loop.h"
#include "core/os/os.h"
#include "core/string/print_string.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
class TestPhysicsMainLoop : public MainLoop {

2
modules/csg/csg_shape.cpp
View File

@ -30,7 +30,7 @@
#include "csg_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "scene/resources/world_3d.h"
#include "scene/resources/mesh/mesh.h"

2
modules/props/prop_instance_prop_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "prop_mesher.h"
#include "scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "singleton/prop_cache.h"
#include "modules/modules_enabled.gen.h"

2
modules/props/props/prop_data.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "prop_data_light.h"
#include "prop_data_prop.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/props/tiled_wall/tiled_wall.cpp
View File

@ -16,7 +16,7 @@
#include "core/core_string_names.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "tiled_wall_data.h"
int TiledWall::get_width() const {

2
modules/props/tiled_wall/tiled_wall_data.cpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#include "tiled_wall_data.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \

2
modules/props_2d/prop_2d_instance_merger.cpp
View File

@ -4,7 +4,7 @@
//#include "../thread_pool/thread_pool.h"
#include "scene/resources/world_2d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/config/engine.h"

2
modules/props_2d/props/prop_2d_data.cpp
View File

@ -26,7 +26,7 @@ SOFTWARE.
#include "prop_2d_data_light.h"
#include "prop_2d_data_prop.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/props_2d/tiled_wall/tiled_wall_2d_data.cpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#include "tiled_wall_2d_data.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \

2
modules/skeleton_3d/nodes/physical_bone.h
View File

@ -34,7 +34,7 @@
#include "core/object/reference.h"
#include "core/containers/vset.h"
#include "scene/3d/collision_object.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "scene/3d/physics_body.h"
class PhysicsMaterial;

2
modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
View File

@ -31,7 +31,7 @@
#include "skeleton_modification_3d_jiggle.h"
#include "../nodes/skeleton.h"
#include "skeleton_modification_stack_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "scene/resources/world_3d.h"
bool SkeletonModification3DJiggle::_set(const StringName &p_path, const Variant &p_value) {

2
modules/terraman/world/default/terrain_chunk_default.cpp
View File

@ -24,7 +24,7 @@ SOFTWARE.
#include "../../defines.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"

2
modules/terraman/world/default/terrain_world_default.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../jobs/terrain_light_job.h"
#include "../jobs/terrain_prop_job.h"
#include "../jobs/terrain_terrain_job.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
_FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const {
return _build_flags;

2
modules/terraman/world/jobs/terrain_prop_job.cpp
View File

@ -32,7 +32,7 @@ SOFTWARE.
#include "../../meshers/terrain_mesher.h"
#include "../default/terrain_chunk_default.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/terraman/world/jobs/terrain_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../meshers/terrain_mesher.h"
#include "../default/terrain_chunk_default.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/terraman/world/terrain_chunk.cpp
View File

@ -28,7 +28,7 @@ SOFTWARE.
#include "core/object/message_queue.h"
#include "jobs/terrain_job.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "terrain_structure.h"
#include "core/os/thread_pool.h"

2
modules/terraman/world/terrain_world_editor.cpp
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "../library/terrain_library.h"
#include "../library/terrain_surface.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "../defines.h"

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

@ -24,7 +24,7 @@ SOFTWARE.
#include "../../defines.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"

2
modules/voxelman/world/default/voxel_chunk_default.cpp
View File

@ -24,7 +24,7 @@ SOFTWARE.
#include "../../defines.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
#include "../../../opensimplex/open_simplex_noise.h"

2
modules/voxelman/world/jobs/voxel_prop_job.cpp
View File

@ -33,7 +33,7 @@ SOFTWARE.
#include "../../library/voxel_material_cache.h"
#include "../default/voxel_chunk_default.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/voxelman/world/jobs/voxel_terrain_job.cpp
View File

@ -30,7 +30,7 @@ SOFTWARE.
#include "../../library/voxel_material_cache.h"
#include "../default/voxel_chunk_default.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "modules/modules_enabled.gen.h"

2
modules/voxelman/world/voxel_chunk.cpp
View File

@ -27,7 +27,7 @@ SOFTWARE.
#include "../defines.h"
#include "jobs/voxel_job.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "voxel_structure.h"
#include "core/os/thread_pool.h"

2
modules/voxelman/world/voxel_world_editor.cpp
View File

@ -34,7 +34,7 @@ SOFTWARE.
#include "../library/voxel_library.h"
#include "../library/voxel_surface.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "../defines.h"

2
scene/3d/area.cpp
View File

@ -32,7 +32,7 @@
#include "scene/resources/shapes/shape.h"
#include "scene/main/scene_string_names.h"
#include "servers/audio_server.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
void Area::set_space_override_mode(SpaceOverride p_mode) {
space_override = p_mode;

2
scene/3d/audio_stream_player_3d.cpp
View File

@ -39,7 +39,7 @@
#include "scene/resources/shapes/shape.h"
#include "scene/resources/world_3d.h"
#include "servers/audio/audio_stream.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
// Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004)
// Speaker-Placement Correction Amplitude Panning (SPCAP)

2
scene/3d/collision_object.cpp
View File

@ -35,7 +35,7 @@
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/world_3d.h"
#include "scene/main/scene_string_names.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
void CollisionObject::_notification(int p_what) {
switch (p_what) {

2
scene/3d/physics_body.h
View File

@ -33,7 +33,7 @@
#include "core/containers/vset.h"
#include "core/object/reference.h"
#include "scene/3d/collision_object.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
class PhysicsMaterial;
class Skeleton;

2
scene/3d/physics_joint.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/
#include "scene/main/spatial.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
class PhysicsBody;

2
scene/3d/ray_cast.cpp
View File

@ -36,7 +36,7 @@
#include "scene/resources/material/material.h"
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
void RayCast::set_cast_to(const Vector3 &p_point) {
cast_to = p_point;

2
scene/3d/shape_cast.h
View File

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

2
scene/3d/soft_body.cpp
View File

@ -37,7 +37,7 @@
#include "scene/3d/physics_body.h"
#include "scene/resources/mesh/mesh.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
SoftBodyRenderingServerHandler::SoftBodyRenderingServerHandler() {}

2
scene/3d/spring_arm.cpp
View File

@ -34,7 +34,7 @@
#include "scene/resources/shapes/shape.h"
#include "scene/resources/shapes/sphere_shape.h"
#include "scene/resources/world_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
SpringArm::SpringArm() :
spring_length(1),

2
scene/main/scene_tree.cpp
View File

@ -54,7 +54,7 @@
#include "servers/audio_server.h"
#include "servers/navigation_server.h"
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "viewport.h"
#include "modules/modules_enabled.gen.h" // For freetype.

2
scene/resources/physics_material.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/
#include "core/object/resource.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
class PhysicsMaterial : public Resource {
GDCLASS(PhysicsMaterial, Resource);

2
scene/resources/shapes/box_shape.cpp
View File

@ -29,7 +29,7 @@
/*************************************************************************/
#include "box_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> BoxShape::get_debug_mesh_lines() {
Vector<Vector3> lines;

2
scene/resources/shapes/capsule_shape.cpp
View File

@ -30,7 +30,7 @@
#include "capsule_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> CapsuleShape::get_debug_mesh_lines() {
float radius = get_radius();

2
scene/resources/shapes/concave_polygon_shape.cpp
View File

@ -30,7 +30,7 @@
#include "concave_polygon_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> ConcavePolygonShape::get_debug_mesh_lines() {
RBSet<DrawEdge> edges;

2
scene/resources/shapes/convex_polygon_shape.cpp
View File

@ -30,7 +30,7 @@
#include "convex_polygon_shape.h"
#include "core/math/convex_hull.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> ConvexPolygonShape::get_debug_mesh_lines() {
PoolVector<Vector3> points = get_points();

2
scene/resources/shapes/cylinder_shape.cpp
View File

@ -30,7 +30,7 @@
#include "cylinder_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> CylinderShape::get_debug_mesh_lines() {
float radius = get_radius();

2
scene/resources/shapes/height_map_shape.cpp
View File

@ -30,7 +30,7 @@
#include "height_map_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> HeightMapShape::get_debug_mesh_lines() {
Vector<Vector3> points;

2
scene/resources/shapes/plane_shape.cpp
View File

@ -30,7 +30,7 @@
#include "plane_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> PlaneShape::get_debug_mesh_lines() {
Plane p = get_plane();

2
scene/resources/shapes/ray_shape.cpp
View File

@ -30,7 +30,7 @@
#include "ray_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> RayShape::get_debug_mesh_lines() {
Vector<Vector3> points;

2
scene/resources/shapes/shape.cpp
View File

@ -33,7 +33,7 @@
#include "core/os/os.h"
#include "scene/main/scene_tree.h"
#include "scene/resources/mesh/mesh.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
void Shape::add_vertices_to_array(PoolVector<Vector3> &array, const Transform &p_xform) {
Vector<Vector3> toadd = get_debug_mesh_lines();

2
scene/resources/shapes/sphere_shape.cpp
View File

@ -30,7 +30,7 @@
#include "sphere_shape.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
Vector<Vector3> SphereShape::get_debug_mesh_lines() {
float r = get_radius();

2
scene/resources/world_3d.h
View File

@ -33,7 +33,7 @@
#include "core/object/resource.h"
#include "scene/resources/environment_3d.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "core/servers/rendering/rendering_server.h"
class Camera;

2
servers/physics/area_sw.h
View File

@ -32,7 +32,7 @@
#include "collision_object_sw.h"
#include "core/containers/self_list.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
//#include "servers/physics/query_sw.h"
class SpaceSW;

2
servers/physics/collision_object_sw.h
View File

@ -32,7 +32,7 @@
#include "broad_phase_sw.h"
#include "core/containers/self_list.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "shape_sw.h"
#ifdef DEBUG_ENABLED

2
servers/physics/physics_server_sw.h
View File

@ -31,7 +31,7 @@
/*************************************************************************/
#include "joints_sw.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "shape_sw.h"
#include "space_sw.h"
#include "step_sw.h"

2
servers/physics/shape_sw.h
View File

@ -33,7 +33,7 @@
#include "core/containers/local_vector.h"
#include "core/math/bsp_tree.h"
#include "core/math/geometry.h"
#include "servers/physics_server.h"
#include "core/servers/physics/physics_server.h"
/*
SHAPE_LINE, ///< plane:"plane"

5
servers/register_server_types.cpp
View File

@ -63,7 +63,7 @@
#include "physics_2d/physics_2d_server_sw.h"
#include "physics_2d/physics_2d_server_wrap_mt.h"
#include "physics_2d_server.h"
#include "physics_server.h"
#include "core/servers/physics/physics_server.h"
#include "rendering/shader_types.h"
#include "scene/debugger/script_debugger_remote.h"
@ -99,7 +99,7 @@ Physics2DServer *_createPandemoniumPhysics2DCallback() {
void register_server_types() {
ClassDB::register_class<AudioServer>();
ClassDB::register_virtual_class<PhysicsServer>();
ClassDB::register_virtual_class<Physics2DServer>();
ClassDB::register_virtual_class<NavigationServer>();
ClassDB::register_virtual_class<Navigation2DServer>();
@ -209,7 +209,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("PhysicsServer", PhysicsServer::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()));