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

fix for issue #897

Browse Source
This commit is contained in:
Stephen Gold 2018-09-11 17:32:42 -07:00
parent e80302728f
commit 4323c4101a
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
jme3-examples/src/main/java/jme3test/bullet/TestBetterCharacter.java
View File

@ -1,26 +1,33 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine All rights reserved. <p/> * Copyright (c) 2009-2018 jMonkeyEngine
* Redistribution and use in source and binary forms, with or without * All rights reserved.
* modification, are permitted provided that the following conditions are met:
* *
* * Redistributions of source code must retain the above copyright notice, * Redistribution and use in source and binary forms, with or without
* this list of conditions and the following disclaimer. <p/> * Redistributions * modification, are permitted provided that the following conditions are
* in binary form must reproduce the above copyright notice, this list of * met:
* conditions and the following disclaimer in the documentation and/or other *
* materials provided with the distribution. <p/> * Neither the name of * * Redistributions of source code must retain the above copyright
* 'jMonkeyEngine' nor the names of its contributors may be used to endorse or * notice, this list of conditions and the following disclaimer.
* promote products derived from this software without specific prior written *
* permission. <p/> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND * * Redistributions in binary form must reproduce the above copyright
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT * notice, this list of conditions and the following disclaimer in the
* NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * documentation and/or other materials provided with the distribution.
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR *
* * Neither the name of 'jMonkeyEngine' nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package jme3test.bullet; package jme3test.bullet;
@ -30,7 +37,6 @@ import com.jme3.bullet.PhysicsSpace;
import com.jme3.bullet.collision.shapes.MeshCollisionShape; import com.jme3.bullet.collision.shapes.MeshCollisionShape;
import com.jme3.bullet.control.BetterCharacterControl; import com.jme3.bullet.control.BetterCharacterControl;
import com.jme3.bullet.control.RigidBodyControl; import com.jme3.bullet.control.RigidBodyControl;
import com.jme3.bullet.debug.DebugTools;
import com.jme3.input.KeyInput; import com.jme3.input.KeyInput;
import com.jme3.input.controls.ActionListener; import com.jme3.input.controls.ActionListener;
import com.jme3.input.controls.KeyTrigger; import com.jme3.input.controls.KeyTrigger;
@ -80,7 +86,13 @@ public class TestBetterCharacter extends SimpleApplication implements ActionList
setupKeys(); setupKeys();
// activate physics // activate physics
bulletAppState = new BulletAppState(); bulletAppState = new BulletAppState() {
@Override
public void prePhysicsTick(PhysicsSpace space, float tpf) {
// Apply radial gravity near the planet, downward gravity elsewhere.
checkPlanetGravity();
}
};
stateManager.attach(bulletAppState); stateManager.attach(bulletAppState);
bulletAppState.setDebugEnabled(true); bulletAppState.setDebugEnabled(true);
@ -123,9 +135,6 @@ public class TestBetterCharacter extends SimpleApplication implements ActionList
@Override @Override
public void simpleUpdate(float tpf) { public void simpleUpdate(float tpf) {
// Apply planet gravity to character if close enough (see below)
checkPlanetGravity();
// Get current forward and left vectors of model by using its rotation // Get current forward and left vectors of model by using its rotation
// to rotate the unit vectors // to rotate the unit vectors
Vector3f modelForwardDir = characterNode.getWorldRotation().mult(Vector3f.UNIT_Z); Vector3f modelForwardDir = characterNode.getWorldRotation().mult(Vector3f.UNIT_Z);