diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-11-03 23:39:44 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 23:39:44 -0300 |
| commit | 7715a261d5f387b7769bb8149735e4131ea97757 (patch) | |
| tree | 41a3bfe4c655470a3e7b9b5e162e48853ca561d2 /platform/x11 | |
| parent | 25c38c75425e3ccfcaed53ebd38fc588d6f35764 (diff) | |
| parent | 7a9ca08f16c500aa0caccc21a8e42564f962971a (diff) | |
Merge pull request #12262 from AndreaCatania/pplug
Physics server plug
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/crash_handler_x11.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 13 | ||||
| -rw-r--r-- | platform/x11/os_x11.h | 5 |
3 files changed, 1 insertions, 18 deletions
diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index 3c54d5cbc2..005a7459f9 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -33,6 +33,7 @@ #include "main/main.h" #include "os_x11.h" +#include "project_settings.h" #ifdef CRASH_HANDLER_ENABLED #include <cxxabi.h> diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 09193e0a2b..fbcc22c58e 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -32,7 +32,6 @@ #include "errno.h" #include "key_mapping_x11.h" #include "print_string.h" -#include "servers/physics/physics_server_sw.h" #include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_wrap_mt.h" @@ -462,12 +461,6 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au requested = None; visual_server->init(); - // - physics_server = memnew(PhysicsServerSW); - physics_server->init(); - //physics_2d_server = memnew( Physics2DServerSW ); - physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>(); - physics_2d_server->init(); input = memnew(InputDefault); @@ -523,12 +516,6 @@ void OS_X11::finalize() { memdelete(visual_server); //memdelete(rasterizer); - physics_server->finish(); - memdelete(physics_server); - - physics_2d_server->finish(); - memdelete(physics_2d_server); - memdelete(power_manager); if (xrandr_handle) diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index b71b456d49..bfa8b5b375 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -42,9 +42,6 @@ #include "main/input_default.h" #include "power_x11.h" #include "servers/audio_server.h" -#include "servers/physics_2d/physics_2d_server_sw.h" -#include "servers/physics_2d/physics_2d_server_wrap_mt.h" -#include "servers/physics_server.h" #include "servers/visual/rasterizer.h" #include <X11/Xcursor/Xcursor.h> @@ -121,10 +118,8 @@ class OS_X11 : public OS_Unix { uint64_t last_click_ms; uint32_t last_button_state; - PhysicsServer *physics_server; unsigned int get_mouse_button_state(unsigned int p_x11_state); void get_key_modifier_state(unsigned int p_x11_state, Ref<InputEventWithModifiers> state); - Physics2DServer *physics_2d_server; MouseMode mouse_mode; Point2i center; |