diff options
| author | AndreaCatania <info@andreacatania.com> | 2017-10-21 13:02:06 +0200 |
|---|---|---|
| committer | AndreaCatania <info@andreacatania.com> | 2017-11-04 03:25:51 +0100 |
| commit | 7a9ca08f16c500aa0caccc21a8e42564f962971a (patch) | |
| tree | 3274c444cab28252757a1dde47995264ac2d2c66 /platform/android | |
| parent | f52ab8d86418a67ddee247ed7765e72935b0c57f (diff) | |
Implemented physics plug
Moved init_physics
Implemented physics 2D plug
Fix clang
Fix clang
Fix static check
Fix clang
Fix static check
Moved physics server initialization
Moved physics server settings initialization
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/os_android.cpp | 5 | ||||
| -rw-r--r-- | platform/android/os_android.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 473a093077..853392cba5 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -155,11 +155,6 @@ void OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int AudioDriverManager::initialize(p_audio_driver); - physics_server = memnew(PhysicsServerSW); - physics_server->init(); - physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>(); - physics_2d_server->init(); - input = memnew(InputDefault); input->set_fallback_mapping("Default Android Gamepad"); diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 0c78c198a8..d9a66b4e3a 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -38,9 +38,6 @@ #include "os/main_loop.h" //#include "power_android.h" #include "servers/audio_server.h" -#include "servers/physics/physics_server_sw.h" -#include "servers/physics_2d/physics_2d_server_sw.h" -#include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "servers/visual/rasterizer.h" #ifdef ANDROID_NATIVE_ACTIVITY @@ -106,8 +103,6 @@ private: bool use_16bits_fbo; VisualServer *visual_server; - PhysicsServer *physics_server; - Physics2DServer *physics_2d_server; mutable String data_dir_cache; |