Browse Source

Updating collider callback

Raanan Weber 9 years ago
parent
commit
0f26a9256c

+ 2 - 0
src/Physics/Plugins/babylon.oimoJSPlugin.ts

@@ -269,10 +269,12 @@ module BABYLON {
             var body = impostor.physicsBody;
             var body = impostor.physicsBody;
             
             
             if(!newPosition.equalsWithEpsilon(impostor.mesh.position)) {
             if(!newPosition.equalsWithEpsilon(impostor.mesh.position)) {
+                //Doesn't work as expected!
                 body.setPosition(newPosition);
                 body.setPosition(newPosition);
             }
             }
             
             
             body.setQuaternion(newRotation);
             body.setQuaternion(newRotation);
+            //body.awake();
         }
         }
 
 
         private _getLastShape(body: any): any {
         private _getLastShape(body: any): any {

+ 2 - 2
src/Physics/babylon.physicsImpostor.ts

@@ -135,11 +135,11 @@ module BABYLON {
             }
             }
         }
         }
 
 
-        public registerOnPhysicsCollide(func: (impostor: PhysicsImpostor) => void): void {
+        public registerOnPhysicsCollide(func: (collider: PhysicsImpostor, collidedAgainst: PhysicsImpostor) => void): void {
             this._onPhysicsCollideCallbacks.push(func);
             this._onPhysicsCollideCallbacks.push(func);
         }
         }
 
 
-        public unregisterOnPhysicsCollide(func: (impostor: PhysicsImpostor) => void): void {
+        public unregisterOnPhysicsCollide(func: (collider: PhysicsImpostor, collidedAgainst: PhysicsImpostor) => void): void {
             var index = this._onPhysicsCollideCallbacks.indexOf(func);
             var index = this._onPhysicsCollideCallbacks.indexOf(func);
 
 
             if (index > -1) {
             if (index > -1) {