From 0a369b96d863ed0515c663f7fdb7ab811b4f46ab Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sun, 27 Mar 2011 00:35:54 +0000 Subject: [PATCH] - add check for negative force to BombControl git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7120 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/test/jme3test/bullet/BombControl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/engine/src/test/jme3test/bullet/BombControl.java b/engine/src/test/jme3test/bullet/BombControl.java index 63b6b64d8..1e2205769 100644 --- a/engine/src/test/jme3test/bullet/BombControl.java +++ b/engine/src/test/jme3test/bullet/BombControl.java @@ -95,7 +95,7 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis space.add(ghostObject); ghostObject.setPhysicsLocation(getPhysicsLocation(vector)); space.addTickListener(this); - if (effect != null && spatial.getParent()!=null) { + if (effect != null && spatial.getParent() != null) { curTime = 0; effect.setLocalTranslation(spatial.getLocalTranslation()); spatial.getParent().attachChild(effect); @@ -120,6 +120,7 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis vector2.subtractLocal(vector); float force = explosionRadius - vector2.length(); force *= forceFactor; + force = force > 0 ? force : 0; vector2.normalizeLocal(); vector2.multLocal(force); ((PhysicsRigidBody) physicsCollisionObject).applyImpulse(vector2, Vector3f.ZERO); @@ -133,9 +134,9 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis public void update(float tpf) { super.update(tpf); if (enabled && curTime >= 0) { - curTime+=tpf; - if(curTime>fxTime){ - curTime=-1; + curTime += tpf; + if (curTime > fxTime) { + curTime = -1; effect.removeFromParent(); } } @@ -165,6 +166,4 @@ public class BombControl extends RigidBodyControl implements PhysicsCollisionLis public void write(JmeExporter ex) throws IOException { throw new UnsupportedOperationException("Saving not supported."); } - - }