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

Bullet (and jBullet): Remove deprecated PhysicsSpace.enableDebug method in favor of BulletAppState.setDebugEnabled.

Browse Source
This commit is contained in:
iwgeric 2015-04-26 19:20:06 -04:00
parent 116adbba1f
commit 70b03ea28a
3 changed files with 14 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jme3-bullet/src/common/java/com/jme3/bullet/BulletAppState.java
View File

@ -226,19 +226,9 @@ public class BulletAppState implements AppState, PhysicsTickListener {
if (debugEnabled && debugAppState == null && pSpace != null) { if (debugEnabled && debugAppState == null && pSpace != null) {
debugAppState = new BulletDebugAppState(pSpace); debugAppState = new BulletDebugAppState(pSpace);
stateManager.attach(debugAppState); stateManager.attach(debugAppState);
pSpace.enableDebug(app.getAssetManager());
} else if (!debugEnabled && debugAppState != null) { } else if (!debugEnabled && debugAppState != null) {
stateManager.detach(debugAppState); stateManager.detach(debugAppState);
debugAppState = null; debugAppState = null;
if (pSpace != null) {
pSpace.enableDebug(null);
}
}
//TODO: remove when deprecation of PhysicsSpace.enableDebug is through
if (pSpace.getDebugManager() != null && !debugEnabled) {
debugEnabled = true;
} else if (pSpace.getDebugManager() == null && debugEnabled) {
debugEnabled = false;
} }
if (!active) { if (!active) {
return; return;

24
jme3-bullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -102,7 +102,6 @@ public class PhysicsSpace {
private Vector3f worldMax = new Vector3f(10000f, 10000f, 10000f); private Vector3f worldMax = new Vector3f(10000f, 10000f, 10000f);
private float accuracy = 1f / 60f; private float accuracy = 1f / 60f;
private int maxSubSteps = 4, rayTestFlags = 1 << 2; private int maxSubSteps = 4, rayTestFlags = 1 << 2;
private AssetManager debugManager;
static { static {
// System.loadLibrary("bulletjme"); // System.loadLibrary("bulletjme");
@ -959,29 +958,6 @@ public class PhysicsSpace {
this.worldMax.set(worldMax); this.worldMax.set(worldMax);
} }
/**
* Enable debug display for physics.
*
* @deprecated in favor of BulletDebugAppState, use
* <code>BulletAppState.setDebugEnabled(boolean)</code> to add automatically
* @param manager AssetManager to use to create debug materials
*/
@Deprecated
public void enableDebug(AssetManager manager) {
debugManager = manager;
}
/**
* Disable debug display
*/
public void disableDebug() {
debugManager = null;
}
public AssetManager getDebugManager() {
return debugManager;
}
public static native void initNativePhysics(); public static native void initNativePhysics();
/** /**

24
jme3-jbullet/src/main/java/com/jme3/bullet/PhysicsSpace.java
View File

@ -142,7 +142,6 @@ public class PhysicsSpace {
private javax.vecmath.Vector3f rayVec2 = new javax.vecmath.Vector3f(); private javax.vecmath.Vector3f rayVec2 = new javax.vecmath.Vector3f();
private com.bulletphysics.linearmath.Transform sweepTrans1 = new com.bulletphysics.linearmath.Transform(new javax.vecmath.Matrix3f()); private com.bulletphysics.linearmath.Transform sweepTrans1 = new com.bulletphysics.linearmath.Transform(new javax.vecmath.Matrix3f());
private com.bulletphysics.linearmath.Transform sweepTrans2 = new com.bulletphysics.linearmath.Transform(new javax.vecmath.Matrix3f()); private com.bulletphysics.linearmath.Transform sweepTrans2 = new com.bulletphysics.linearmath.Transform(new javax.vecmath.Matrix3f());
private AssetManager debugManager;
/** /**
* Get the current PhysicsSpace <b>running on this thread</b><br/> * Get the current PhysicsSpace <b>running on this thread</b><br/>
@ -877,29 +876,6 @@ public class PhysicsSpace {
this.worldMax.set(worldMax); this.worldMax.set(worldMax);
} }
/**
* Enable debug display for physics.
*
* @deprecated in favor of BulletDebugAppState, use
* <code>BulletAppState.setDebugEnabled(boolean)</code> to add automatically
* @param manager AssetManager to use to create debug materials
*/
@Deprecated
public void enableDebug(AssetManager manager) {
debugManager = manager;
}
/**
* Disable debug display
*/
public void disableDebug() {
debugManager = null;
}
public AssetManager getDebugManager() {
return debugManager;
}
/** /**
* interface with Broadphase types * interface with Broadphase types
*/ */