diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-26 01:05:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-26 01:06:05 -0300 |
| commit | 9df77d276593ef7082e3971d1c180b8f74b0cb2e (patch) | |
| tree | 449dc05c32222d54507dba5cfc0973097d9ffdf4 /platform/android | |
| parent | 3826b66a6ed785845757fbe54f6a3d028ef79720 (diff) | |
| download | redot-engine-9df77d276593ef7082e3971d1c180b8f74b0cb2e.tar.gz | |
ability to run 2D physics in a thread
also, 2D physics is now thread safe too.
see physics_2d/thread_model
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/os_android.cpp | 3 | ||||
| -rw-r--r-- | platform/android/os_android.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 80953df85f..612148418b 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -163,7 +163,8 @@ void OS_Android::initialize(const VideoMode& p_desired,int p_video_driver,int p_ // physics_server = memnew( PhysicsServerSW ); physics_server->init(); - physics_2d_server = memnew( Physics2DServerSW ); + //physics_2d_server = memnew( Physics2DServerSW ); + physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>(); physics_2d_server->init(); input = memnew( InputDefault ); diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 41892d23b4..7a5a55653f 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -37,6 +37,7 @@ #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" #include "servers/audio/audio_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" |