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/haiku | |
| parent | 25c38c75425e3ccfcaed53ebd38fc588d6f35764 (diff) | |
| parent | 7a9ca08f16c500aa0caccc21a8e42564f962971a (diff) | |
Merge pull request #12262 from AndreaCatania/pplug
Physics server plug
Diffstat (limited to 'platform/haiku')
| -rw-r--r-- | platform/haiku/os_haiku.cpp | 13 | ||||
| -rw-r--r-- | platform/haiku/os_haiku.h | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 1d52752f21..7a681d46f7 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -130,13 +130,6 @@ void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_ window->Show(); visual_server->init(); - physics_server = memnew(PhysicsServerSW); - physics_server->init(); - physics_2d_server = memnew(Physics2DServerSW); - // TODO: enable multithreaded PS - //physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>(); - physics_2d_server->init(); - AudioDriverManager::initialize(p_audio_driver); power_manager = memnew(PowerHaiku); @@ -153,12 +146,6 @@ void OS_Haiku::finalize() { memdelete(visual_server); memdelete(rasterizer); - physics_server->finish(); - memdelete(physics_server); - - physics_2d_server->finish(); - memdelete(physics_2d_server); - memdelete(input); #if defined(OPENGL_ENABLED) diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index d929f7e43b..501650c94f 100644 --- a/platform/haiku/os_haiku.h +++ b/platform/haiku/os_haiku.h @@ -38,8 +38,6 @@ #include "main/input_default.h" #include "power_haiku.h" #include "servers/audio_server.h" -#include "servers/physics_2d/physics_2d_server_sw.h" -#include "servers/physics_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual_server.h" @@ -52,8 +50,6 @@ private: Rasterizer *rasterizer; VisualServer *visual_server; VideoMode current_video_mode; - PhysicsServer *physics_server; - Physics2DServer *physics_2d_server; PowerHaiku *power_manager; #ifdef MEDIA_KIT_ENABLED |