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

fix for issue #1126 (TestHoveringTank assertion failures)

Browse Source
This commit is contained in:
Stephen Gold 2019-06-18 08:36:44 -07:00
parent ccfaeab9d4
commit 6efc25f5b2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jme3-examples/src/main/java/jme3test/bullet/PhysicsHoverControl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine * Copyright (c) 2009-2019 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -145,6 +145,7 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro
Vector3f dir = getForwardVector(tempVect2).multLocal(1, 0, 1).normalizeLocal(); Vector3f dir = getForwardVector(tempVect2).multLocal(1, 0, 1).normalizeLocal();
getLinearVelocity(tempVect3); getLinearVelocity(tempVect3);
Vector3f linearVelocity = tempVect3.multLocal(1, 0, 1); Vector3f linearVelocity = tempVect3.multLocal(1, 0, 1);
float groundSpeed = linearVelocity.length();
if (steeringValue != 0) { if (steeringValue != 0) {
if (rotationVelocity < 1 && rotationVelocity > -1) { if (rotationVelocity < 1 && rotationVelocity > -1) {
@ -163,16 +164,18 @@ public class PhysicsHoverControl extends PhysicsVehicle implements PhysicsContro
// if we are not going where we want to go. // if we are not going where we want to go.
// this will prevent "drifting" and thus improve control // this will prevent "drifting" and thus improve control
// of the vehicle // of the vehicle
float d = dir.dot(linearVelocity.normalize()); if (groundSpeed > FastMath.ZERO_TOLERANCE) {
Vector3f counter = dir.project(linearVelocity).normalizeLocal().negateLocal().multLocal(1 - d); float d = dir.dot(linearVelocity.normalize());
applyForce(counter.multLocal(mass * 10), Vector3f.ZERO); Vector3f counter = dir.project(linearVelocity).normalizeLocal().negateLocal().multLocal(1 - d);
applyForce(counter.multLocal(mass * 10), Vector3f.ZERO);
}
if (linearVelocity.length() < 30) { if (linearVelocity.length() < 30) {
applyForce(dir.multLocal(accelerationValue), Vector3f.ZERO); applyForce(dir.multLocal(accelerationValue), Vector3f.ZERO);
} }
} else { } else {
// counter the acceleration value // counter the acceleration value
if (linearVelocity.length() > FastMath.ZERO_TOLERANCE) { if (groundSpeed > FastMath.ZERO_TOLERANCE) {
linearVelocity.normalizeLocal().negateLocal(); linearVelocity.normalizeLocal().negateLocal();
applyForce(linearVelocity.mult(mass * 10), Vector3f.ZERO); applyForce(linearVelocity.mult(mass * 10), Vector3f.ZERO);
} }