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/osx/os_osx.mm | |
| parent | 25c38c75425e3ccfcaed53ebd38fc588d6f35764 (diff) | |
| parent | 7a9ca08f16c500aa0caccc21a8e42564f962971a (diff) | |
Merge pull request #12262 from AndreaCatania/pplug
Physics server plug
Diffstat (limited to 'platform/osx/os_osx.mm')
| -rw-r--r-- | platform/osx/os_osx.mm | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 33586086dc..78acc97676 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -35,7 +35,6 @@ #include "os/keyboard.h" #include "print_string.h" #include "sem_osx.h" -#include "servers/physics/physics_server_sw.h" #include "servers/visual/visual_server_raster.h" #include <Carbon/Carbon.h> @@ -1092,13 +1091,6 @@ void OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_au AudioDriverManager::initialize(p_audio_driver); - // - 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); joypad_osx = memnew(JoypadOSX); @@ -1120,12 +1112,6 @@ void OS_OSX::finalize() { visual_server->finish(); memdelete(visual_server); //memdelete(rasterizer); - - physics_server->finish(); - memdelete(physics_server); - - physics_2d_server->finish(); - memdelete(physics_2d_server); } void OS_OSX::set_main_loop(MainLoop *p_main_loop) { |