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

- bullet native: fix changed signature for PhysicsCollisionEvent methods

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8403 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-10-15 21:30:42 +00:00
parent 3dfe94f84b
commit 3bf64fb343
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/src/bullet/com/jme3/bullet/collision/PhysicsCollisionEvent.java
View File

@ -150,12 +150,20 @@ public class PhysicsCollisionEvent extends EventObject {
} }
private native int getIndex1(long manifoldPointObjectId); private native int getIndex1(long manifoldPointObjectId);
public Vector3f getLateralFrictionDir1() {
return getLateralFrictionDir1(new Vector3f());
}
public Vector3f getLateralFrictionDir1(Vector3f lateralFrictionDir1) { public Vector3f getLateralFrictionDir1(Vector3f lateralFrictionDir1) {
getLateralFrictionDir1(manifoldPointObjectId, lateralFrictionDir1); getLateralFrictionDir1(manifoldPointObjectId, lateralFrictionDir1);
return lateralFrictionDir1; return lateralFrictionDir1;
} }
private native void getLateralFrictionDir1(long manifoldPointObjectId, Vector3f lateralFrictionDir1); private native void getLateralFrictionDir1(long manifoldPointObjectId, Vector3f lateralFrictionDir1);
public Vector3f getLateralFrictionDir2() {
return getLateralFrictionDir2(new Vector3f());
}
public Vector3f getLateralFrictionDir2(Vector3f lateralFrictionDir2) { public Vector3f getLateralFrictionDir2(Vector3f lateralFrictionDir2) {
getLateralFrictionDir2(manifoldPointObjectId, lateralFrictionDir2); getLateralFrictionDir2(manifoldPointObjectId, lateralFrictionDir2);
return lateralFrictionDir2; return lateralFrictionDir2;
@ -172,18 +180,30 @@ public class PhysicsCollisionEvent extends EventObject {
} }
private native int getLifeTime(long manifoldPointObjectId); private native int getLifeTime(long manifoldPointObjectId);
public Vector3f getLocalPointA() {
return getLocalPointA(new Vector3f());
}
public Vector3f getLocalPointA(Vector3f localPointA) { public Vector3f getLocalPointA(Vector3f localPointA) {
getLocalPointA(manifoldPointObjectId, localPointA); getLocalPointA(manifoldPointObjectId, localPointA);
return localPointA; return localPointA;
} }
private native void getLocalPointA(long manifoldPointObjectId, Vector3f localPointA); private native void getLocalPointA(long manifoldPointObjectId, Vector3f localPointA);
public Vector3f getLocalPointB() {
return getLocalPointB(new Vector3f());
}
public Vector3f getLocalPointB(Vector3f localPointB) { public Vector3f getLocalPointB(Vector3f localPointB) {
getLocalPointB(manifoldPointObjectId, localPointB); getLocalPointB(manifoldPointObjectId, localPointB);
return localPointB; return localPointB;
} }
private native void getLocalPointB(long manifoldPointObjectId, Vector3f localPointB); private native void getLocalPointB(long manifoldPointObjectId, Vector3f localPointB);
public Vector3f getNormalWorldOnB() {
return getNormalWorldOnB(new Vector3f());
}
public Vector3f getNormalWorldOnB(Vector3f normalWorldOnB) { public Vector3f getNormalWorldOnB(Vector3f normalWorldOnB) {
getNormalWorldOnB(manifoldPointObjectId, normalWorldOnB); getNormalWorldOnB(manifoldPointObjectId, normalWorldOnB);
return normalWorldOnB; return normalWorldOnB;
@ -201,12 +221,20 @@ public class PhysicsCollisionEvent extends EventObject {
private native int getPartId1(long manifoldPointObjectId); private native int getPartId1(long manifoldPointObjectId);
public Vector3f getPositionWorldOnA() {
return getPositionWorldOnA(new Vector3f());
}
public Vector3f getPositionWorldOnA(Vector3f positionWorldOnA) { public Vector3f getPositionWorldOnA(Vector3f positionWorldOnA) {
getPositionWorldOnA(positionWorldOnA); getPositionWorldOnA(positionWorldOnA);
return positionWorldOnA; return positionWorldOnA;
} }
private native void getPositionWorldOnA(long manifoldPointObjectId, Vector3f positionWorldOnA); private native void getPositionWorldOnA(long manifoldPointObjectId, Vector3f positionWorldOnA);
public Vector3f getPositionWorldOnB() {
return getPositionWorldOnB(new Vector3f());
}
public Vector3f getPositionWorldOnB(Vector3f positionWorldOnB) { public Vector3f getPositionWorldOnB(Vector3f positionWorldOnB) {
getPositionWorldOnB(manifoldPointObjectId, positionWorldOnB); getPositionWorldOnB(manifoldPointObjectId, positionWorldOnB);
return positionWorldOnB; return positionWorldOnB;