From 9b487ede598b2f117e948f06b2688af8158f731a Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Wed, 6 Feb 2013 03:02:26 +0000 Subject: [PATCH] - remove check for class in debug view (was because of wrong shape scales) git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10353 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/bullet/debug/BulletCharacterDebugControl.java | 5 +---- .../com/jme3/bullet/debug/BulletGhostObjectDebugControl.java | 5 +---- .../com/jme3/bullet/debug/BulletRigidBodyDebugControl.java | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/engine/src/bullet-common/com/jme3/bullet/debug/BulletCharacterDebugControl.java b/engine/src/bullet-common/com/jme3/bullet/debug/BulletCharacterDebugControl.java index 288f44368..5e7f7bbd6 100644 --- a/engine/src/bullet-common/com/jme3/bullet/debug/BulletCharacterDebugControl.java +++ b/engine/src/bullet-common/com/jme3/bullet/debug/BulletCharacterDebugControl.java @@ -85,10 +85,7 @@ public class BulletCharacterDebugControl extends AbstractPhysicsDebugControl { node.attachChild(geom); } applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY); - //no scaling for sphere, capsule, cylinder - if (!(body.getCollisionShape() instanceof CylinderCollisionShape) && !(body.getCollisionShape() instanceof CapsuleCollisionShape) || !(body.getCollisionShape() instanceof SphereCollisionShape)) { - geom.setLocalScale(body.getCollisionShape().getScale()); - } + geom.setLocalScale(body.getCollisionShape().getScale()); } @Override diff --git a/engine/src/bullet-common/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java b/engine/src/bullet-common/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java index 8318d96b6..88da19e4f 100644 --- a/engine/src/bullet-common/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java +++ b/engine/src/bullet-common/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java @@ -86,10 +86,7 @@ public class BulletGhostObjectDebugControl extends AbstractPhysicsDebugControl{ node.attachChild(geom); } applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY); - //no scaling for sphere, capsule, cylinder - if (!(body.getCollisionShape() instanceof CylinderCollisionShape) && !(body.getCollisionShape() instanceof CapsuleCollisionShape) || !(body.getCollisionShape() instanceof SphereCollisionShape)) { - geom.setLocalScale(body.getCollisionShape().getScale()); - } + geom.setLocalScale(body.getCollisionShape().getScale()); } @Override diff --git a/engine/src/bullet-common/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java b/engine/src/bullet-common/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java index f78a03497..de89ce24a 100644 --- a/engine/src/bullet-common/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java +++ b/engine/src/bullet-common/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java @@ -86,10 +86,7 @@ public class BulletRigidBodyDebugControl extends AbstractPhysicsDebugControl { node.attachChild(geom); } applyPhysicsTransform(body.getPhysicsLocation(location), body.getPhysicsRotation(rotation)); - //no scaling for sphere, capsule, cylinder - if (!(body.getCollisionShape() instanceof CylinderCollisionShape) && !(body.getCollisionShape() instanceof CapsuleCollisionShape) || !(body.getCollisionShape() instanceof SphereCollisionShape)) { - geom.setLocalScale(body.getCollisionShape().getScale()); - } + geom.setLocalScale(body.getCollisionShape().getScale()); } @Override