sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed typo in assert described in issue #538

Browse Source
This commit is contained in:
Domenic 2018-01-13 19:18:53 +01:00 committed by Rémy Bouquet
parent 76028201bf
commit c4b635bb6f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -235,7 +235,7 @@ public class PhysicsSpace {
// collides = (bp1.collisionFilterGroup & bp.collisionFilterMask) != 0; // collides = (bp1.collisionFilterGroup & bp.collisionFilterMask) != 0;
// } // }
// if (collides) { // if (collides) {
// assert (bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject && bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject); // assert (bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject && bp1.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject);
// com.bulletphysics.collision.dispatch.CollisionObject colOb = (com.bulletphysics.collision.dispatch.CollisionObject) bp.clientObject; // com.bulletphysics.collision.dispatch.CollisionObject colOb = (com.bulletphysics.collision.dispatch.CollisionObject) bp.clientObject;
// com.bulletphysics.collision.dispatch.CollisionObject colOb1 = (com.bulletphysics.collision.dispatch.CollisionObject) bp1.clientObject; // com.bulletphysics.collision.dispatch.CollisionObject colOb1 = (com.bulletphysics.collision.dispatch.CollisionObject) bp1.clientObject;
// assert (colOb.getUserPointer() != null && colOb1.getUserPointer() != null); // assert (colOb.getUserPointer() != null && colOb1.getUserPointer() != null);

2
jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -227,7 +227,7 @@ public class PhysicsSpace {
collides = (bp1.collisionFilterGroup & bp.collisionFilterMask) != 0; collides = (bp1.collisionFilterGroup & bp.collisionFilterMask) != 0;
} }
if (collides) { if (collides) {
assert (bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject && bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject); assert (bp.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject && bp1.clientObject instanceof com.bulletphysics.collision.dispatch.CollisionObject);
com.bulletphysics.collision.dispatch.CollisionObject colOb = (com.bulletphysics.collision.dispatch.CollisionObject) bp.clientObject; com.bulletphysics.collision.dispatch.CollisionObject colOb = (com.bulletphysics.collision.dispatch.CollisionObject) bp.clientObject;
com.bulletphysics.collision.dispatch.CollisionObject colOb1 = (com.bulletphysics.collision.dispatch.CollisionObject) bp1.clientObject; com.bulletphysics.collision.dispatch.CollisionObject colOb1 = (com.bulletphysics.collision.dispatch.CollisionObject) bp1.clientObject;
assert (colOb.getUserPointer() != null && colOb1.getUserPointer() != null); assert (colOb.getUserPointer() != null && colOb1.getUserPointer() != null);