summaryrefslogtreecommitdiff
path: root/platform/iphone
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-26 01:05:08 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-26 01:06:05 -0300
commit9df77d276593ef7082e3971d1c180b8f74b0cb2e (patch)
tree449dc05c32222d54507dba5cfc0973097d9ffdf4 /platform/iphone
parent3826b66a6ed785845757fbe54f6a3d028ef79720 (diff)
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/iphone')
-rw-r--r--platform/iphone/os_iphone.cpp3
-rw-r--r--platform/iphone/os_iphone.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
index bf85ecc9dd..ade1c292a4 100644
--- a/platform/iphone/os_iphone.cpp
+++ b/platform/iphone/os_iphone.cpp
@@ -136,7 +136,8 @@ void OSIPhone::initialize(const VideoMode& p_desired,int p_video_driver,int p_au
//
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/iphone/os_iphone.h b/platform/iphone/os_iphone.h
index 721db36f41..844f067552 100644
--- a/platform/iphone/os_iphone.h
+++ b/platform/iphone/os_iphone.h
@@ -38,6 +38,7 @@
#include "servers/visual/rasterizer.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/audio/audio_server_sw.h"
#include "servers/audio/sample_manager_sw.h"
#include "servers/spatial_sound/spatial_sound_server_sw.h"