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

- fix missing material in debug state

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10354 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-02-06 03:16:50 +00:00
parent 9b487ede59
commit d729bbc43a
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/bullet-common/com/jme3/bullet/debug/BulletCharacterDebugControl.java
View File

@ -31,10 +31,7 @@
*/ */
package com.jme3.bullet.debug; package com.jme3.bullet.debug;
import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.collision.shapes.CollisionShape;
import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.objects.PhysicsCharacter; import com.jme3.bullet.objects.PhysicsCharacter;
import com.jme3.bullet.util.DebugShapeFactory; import com.jme3.bullet.util.DebugShapeFactory;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
@ -82,6 +79,7 @@ public class BulletCharacterDebugControl extends AbstractPhysicsDebugControl {
Node node = (Node) this.spatial; Node node = (Node) this.spatial;
node.detachChild(geom); node.detachChild(geom);
geom = DebugShapeFactory.getDebugShape(body.getCollisionShape()); geom = DebugShapeFactory.getDebugShape(body.getCollisionShape());
geom.setMaterial(debugAppState.DEBUG_PINK);
node.attachChild(geom); node.attachChild(geom);
} }
applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY); applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY);

5
engine/src/bullet-common/com/jme3/bullet/debug/BulletGhostObjectDebugControl.java
View File

@ -31,10 +31,7 @@
*/ */
package com.jme3.bullet.debug; package com.jme3.bullet.debug;
import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.collision.shapes.CollisionShape;
import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.objects.PhysicsGhostObject; import com.jme3.bullet.objects.PhysicsGhostObject;
import com.jme3.bullet.util.DebugShapeFactory; import com.jme3.bullet.util.DebugShapeFactory;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
@ -49,6 +46,7 @@ import com.jme3.scene.Spatial;
* @author normenhansen * @author normenhansen
*/ */
public class BulletGhostObjectDebugControl extends AbstractPhysicsDebugControl { public class BulletGhostObjectDebugControl extends AbstractPhysicsDebugControl {
protected final PhysicsGhostObject body; protected final PhysicsGhostObject body;
protected final Vector3f location = new Vector3f(); protected final Vector3f location = new Vector3f();
protected final Quaternion rotation = new Quaternion(); protected final Quaternion rotation = new Quaternion();
@ -83,6 +81,7 @@ public class BulletGhostObjectDebugControl extends AbstractPhysicsDebugControl{
Node node = (Node) this.spatial; Node node = (Node) this.spatial;
node.detachChild(geom); node.detachChild(geom);
geom = DebugShapeFactory.getDebugShape(body.getCollisionShape()); geom = DebugShapeFactory.getDebugShape(body.getCollisionShape());
geom.setMaterial(debugAppState.DEBUG_YELLOW);
node.attachChild(geom); node.attachChild(geom);
} }
applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY); applyPhysicsTransform(body.getPhysicsLocation(location), Quaternion.IDENTITY);

4
engine/src/bullet-common/com/jme3/bullet/debug/BulletRigidBodyDebugControl.java
View File

@ -31,10 +31,7 @@
*/ */
package com.jme3.bullet.debug; package com.jme3.bullet.debug;
import com.jme3.bullet.collision.shapes.CapsuleCollisionShape;
import com.jme3.bullet.collision.shapes.CollisionShape; import com.jme3.bullet.collision.shapes.CollisionShape;
import com.jme3.bullet.collision.shapes.CylinderCollisionShape;
import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.objects.PhysicsRigidBody; import com.jme3.bullet.objects.PhysicsRigidBody;
import com.jme3.bullet.util.DebugShapeFactory; import com.jme3.bullet.util.DebugShapeFactory;
import com.jme3.math.Quaternion; import com.jme3.math.Quaternion;
@ -83,6 +80,7 @@ public class BulletRigidBodyDebugControl extends AbstractPhysicsDebugControl {
Node node = (Node) this.spatial; Node node = (Node) this.spatial;
node.detachChild(geom); node.detachChild(geom);
geom = DebugShapeFactory.getDebugShape(body.getCollisionShape()); geom = DebugShapeFactory.getDebugShape(body.getCollisionShape());
geom.setMaterial(debugAppState.DEBUG_BLUE);
node.attachChild(geom); node.attachChild(geom);
} }
applyPhysicsTransform(body.getPhysicsLocation(location), body.getPhysicsRotation(rotation)); applyPhysicsTransform(body.getPhysicsLocation(location), body.getPhysicsRotation(rotation));