noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #12262 from AndreaCatania/pplug

Browse Source 
Physics server plug
This commit is contained in:
Juan Linietsky
2017-11-03 23:39:44 -03:00
committed by GitHub
parent 25c38c7542 7a9ca08f16
commit 7715a261d5
28 changed files with 286 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/iphone/os_iphone.cpp
-13
View File
@@ -138,13 +138,6 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_
AudioDriverManager::add_driver(&audio_driver);
AudioDriverManager::initialize(p_audio_driver);
// init physics servers
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);
/*
@@ -384,12 +377,6 @@ void OSIPhone::finalize() {
memdelete(visual_server);
// memdelete(rasterizer);
physics_server->finish();
memdelete(physics_server);
physics_2d_server->finish();
memdelete(physics_2d_server);
memdelete(input);
};
platform/iphone/os_iphone.h
-5
View File
@@ -41,9 +41,6 @@
#include "in_app_store.h"
#include "main/input_default.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"
#include "servers/visual_server.h"
@@ -66,8 +63,6 @@ private:
uint8_t supported_orientations;
VisualServer *visual_server;
PhysicsServer *physics_server;
Physics2DServer *physics_2d_server;
AudioDriverCoreAudio audio_driver;