Forráskód Böngészése

Physics event will now send collision entities as well as physics entities

Ivan Safrin 11 éve
szülő
commit
9f4cc52da6

+ 3 - 0
Modules/Contents/3DPhysics/Include/PolyPhysicsScene.h

@@ -50,6 +50,9 @@ namespace Polycode {
 			
 			PhysicsEntity *entityA;
 			PhysicsEntity *entityB;
+            CollisionEntity *collisionEntityA;
+            CollisionEntity *collisionEntityB;
+        
 
 			Number appliedImpulse;
 						

+ 3 - 1
Modules/Contents/3DPhysics/Source/PolyPhysicsScene.cpp

@@ -134,7 +134,9 @@ void PhysicsScene::processWorldCollisions() {
 								
 				event->entityA = getPhysicsEntityByCollisionObject(obA);	
 				event->entityB = getPhysicsEntityByCollisionObject(obB);
-												
+                event->collisionEntityA = getCollisionEntityByObject(obA);
+                event->collisionEntityB = getCollisionEntityByObject(obB);
+            
 				dispatchEvent(event, PhysicsSceneEvent::COLLISION_EVENT);
 		//	}
 		}