Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Dynamics/Physics/PhysX/PhysX.cpp

Diff revisions: vs.
  @@ -84,10 +84,10 @@
84 84 }
85 85
86 86 if (!_cooking) {
87 - PxCookingParams* cookparams = New PxCookingParams(PxTolerancesScale());
87 + PxCookingParams* cookparams = MemoryManager_NEW PxCookingParams(PxTolerancesScale());
88 88 cookparams->targetPlatform = PxPlatform::ePC;
89 89 _cooking = PxCreateCooking(PX_PHYSICS_VERSION, *_foundation, *cookparams);
90 - MemoryManager::SAFE_DELETE( cookparams );
90 + MemoryManager::DELETE( cookparams );
91 91 }
92 92
93 93 updateTimeStep(targetFrameRate);
  @@ -103,7 +103,9 @@
103 103
104 104 PRINT_FN(Locale::get("STOP_PHYSX_API"));
105 105
106 - DIVIDE_ASSERT( _targetScene == nullptr, "PhysX error: target scene not destroyed before calling closePhysicsApi. Call \"setPhysicsScene( nullptr )\" first" );
106 + DIVIDE_ASSERT(_targetScene == nullptr,
107 + "PhysX error: target scene not destroyed before calling closePhysicsApi."
108 + "Call \"setPhysicsScene( nullptr )\" first" );
107 109
108 110 if (_cooking) {
109 111 _cooking->release();
  @@ -153,12 +155,12 @@
153 155 }
154 156
155 157 PhysicsSceneInterface* PhysX::NewSceneInterface(Scene* scene) {
156 - return New PhysXSceneInterface(scene);
158 + return MemoryManager_NEW PhysXSceneInterface(scene);
157 159 }
158 160
159 161 void PhysX::setPhysicsScene( PhysicsSceneInterface* const targetScene ) {
160 162 if ( _targetScene ) {
161 - MemoryManager::SAFE_DELETE( _targetScene );
163 + MemoryManager::DELETE( _targetScene );
162 164 }
163 165 _targetScene = targetScene;
164 166 }
  @@ -168,7 +170,10 @@
168 170 _targetScene->init();
169 171 }
170 172
171 - bool PhysX::createActor(SceneGraphNode* const node, const stringImpl& sceneName, PhysicsActorMask mask, PhysicsCollisionGroup group) {
173 + bool PhysX::createActor(SceneGraphNode* const node,
174 + const stringImpl& sceneName,
175 + PhysicsActorMask mask,
176 + PhysicsCollisionGroup group) {
172 177 assert(node != nullptr);
173 178 assert(_targetScene != nullptr);
174 179
  @@ -251,7 +256,7 @@
251 256 }
252 257
253 258 if (!tempActor->_actor) {
254 - MemoryManager::SAFE_DELETE( tempActor );
259 + MemoryManager::DELETE( tempActor );
255 260 return false;
256 261 }
257 262