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/PhysXSceneInterface.cpp

Diff revisions: vs.
  @@ -76,12 +76,11 @@
76 76 D_PRINT_FN( Locale::get( "STOP_PHYSX_SCENE_INTERFACE" ) );
77 77
78 78 idle();
79 - for ( RigidMap::iterator it = _sceneRigidActors.begin(); it != _sceneRigidActors.end(); ++it ) {
80 - ( *it )->_actor->release();
81 - MemoryManager::SAFE_DELETE( *it );
79 + for (PhysXActor* actor : _sceneRigidActors) {
80 + actor->_actor->release();
82 81 }
83 82
84 - _sceneRigidActors.clear();
83 + MemoryManager::DELETE_VECTOR(_sceneRigidActors);
85 84
86 85 if ( _cpuDispatcher ) {
87 86 _cpuDispatcher->release();
  @@ -117,7 +116,7 @@
117 116 }
118 117
119 118 namespace {
120 - PxShape* g_shapes[2048];// = New PxShape*[nShapes];
119 + PxShape* g_shapes[2048];// = MemoryManager_NEW PxShape*[nShapes];
121 120 }
122 121 void PhysXSceneInterface::updateActor(PhysXActor& actor){
123 122 STUBBED("ToDo: Add a better synchronization method between SGN's transform and PhysXActor's pose!! -Ionut")
  @@ -189,7 +188,7 @@
189 188 }
190 189 }
191 190
192 - PhysXActor* newActor = New PhysXActor();
191 + PhysXActor* newActor = MemoryManager_NEW PhysXActor();
193 192 newActor->_actorName = actorName;
194 193 return newActor;
195 194 }
  @@ -201,7 +200,7 @@
201 200 _gScene->addActor(*(actor._actor));
202 201 U32 nbActors = _gScene->getNbActors(PxActorTypeSelectionFlag::eRIGID_DYNAMIC |
203 202 PxActorTypeSelectionFlag::eRIGID_STATIC);
204 - PxShape** shapes=New PxShape*[actor._actor->getNbShapes()];
203 + PxShape** shapes = MemoryManager_NEW PxShape*[actor._actor->getNbShapes()];
205 204 actor._actor->getShapes(shapes, actor._actor->getNbShapes());
206 205
207 206 stringImpl sgnName = "";
  @@ -247,7 +246,7 @@
247 246 }break;
248 247 }
249 248
250 - MemoryManager::SAFE_DELETE_ARRAY( shapes );
249 + MemoryManager::DELETE_ARRAY( shapes );
251 250
252 251 if(actor._type != PxGeometryType::eTRIANGLEMESH) {
253 252 if(sceneNode){