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

Bullet PhysicsRididBody : compile time error fix

Browse Source
This commit is contained in:
Maselbas 2015-05-18 00:34:42 +02:00
parent 878f2cbbbc
commit 3780061863
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jme3-bullet-native/src/native/cpp/com_jme3_bullet_objects_PhysicsRigidBody.cpp
View File

@ -829,20 +829,20 @@ extern "C" {
* Method: setAngularFactor * Method: setAngularFactor
* Signature: (JF)V * Signature: (JF)V
*/ */
JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_PhysicsRigidBody_setAngularFactor // JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_PhysicsRigidBody_setAngularFactor
(JNIEnv *env, jobject object, jlong bodyId, jfloat value) { // (JNIEnv *env, jobject object, jlong bodyId, jfloat value) {
btRigidBody* body = reinterpret_cast<btRigidBody*>(bodyId); // btRigidBody* body = reinterpret_cast<btRigidBody*>(bodyId);
if (body == NULL) { // if (body == NULL) {
jclass newExc = env->FindClass("java/lang/NullPointerException"); // jclass newExc = env->FindClass("java/lang/NullPointerException");
env->ThrowNew(newExc, "The native object does not exist."); // env->ThrowNew(newExc, "The native object does not exist.");
return; // return;
} // }
btVector3 vec1 = btVector3(); // btVector3 vec1 = btVector3();
vec1.setX(value); // vec1.setX(value);
vec1.setY(value); // vec1.setY(value);
vec1.setZ(value); // vec1.setZ(value);
body->setAngularFactor(vec1); // body->setAngularFactor(vec1);
} // }
/* /*
* Class: com_jme3_bullet_objects_PhysicsRigidBody * Class: com_jme3_bullet_objects_PhysicsRigidBody

4
jme3-bullet-native/src/native/cpp/com_jme3_bullet_objects_PhysicsRigidBody.h
View File

@ -406,8 +406,8 @@ JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_PhysicsRigidBody_getAngularF
* Method: setAngularFactor * Method: setAngularFactor
* Signature: (JF)V * Signature: (JF)V
*/ */
JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_PhysicsRigidBody_setAngularFactor //JNIEXPORT void JNICALL Java_com_jme3_bullet_objects_PhysicsRigidBody_setAngularFactor
(JNIEnv *, jobject, jlong, jfloat); // (JNIEnv *, jobject, jlong, jfloat);
/* /*
* Class: com_jme3_bullet_objects_PhysicsRigidBody * Class: com_jme3_bullet_objects_PhysicsRigidBody

4
jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java
View File

@ -635,11 +635,9 @@ public class PhysicsRigidBody extends PhysicsCollisionObject {
private native void getAngularFactor(long objectId, Vector3f vec); private native void getAngularFactor(long objectId, Vector3f vec);
public void setAngularFactor(float factor) { public void setAngularFactor(float factor) {
setAngularFactor(objectId, factor); setAngularFactor(objectId, new Vector3f(factor, factor, factor));
} }
private native void setAngularFactor(long objectId, float factor);
public void setAngularFactor(Vector3f factor) { public void setAngularFactor(Vector3f factor) {
setAngularFactor(objectId, factor); setAngularFactor(objectId, factor);
} }