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

tests and fixes for issues #918 and #919

Browse Source
accellbaker
Stephen Gold 6 years ago
parent 697b4a675e
commit 8f26a3cc3f
4 changed files with 159 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_Point2PointJoint.cpp
  2. 4
      jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_motors_TranslationalLimitMotor.cpp
  3. 81
      jme3-examples/src/main/java/jme3test/bullet/TestIssue918.java
  4. 72
      jme3-examples/src/main/java/jme3test/bullet/TestIssue919.java

8
jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_Point2PointJoint.cpp
Unescape View File

@ -111,13 +111,13 @@ extern "C" {
*/
JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_joints_Point2PointJoint_getImpulseClamp
(JNIEnv * env, jobject object, jlong jointId) {
btPoint2PointConstraint* joint = reinterpret_cast<btPoint2PointConstraint*>(jointId);
btPoint2PointConstraint* joint = reinterpret_cast<btPoint2PointConstraint*> (jointId);
if (joint == NULL) {
jclass newExc = env->FindClass("java/lang/NullPointerException");
env->ThrowNew(newExc, "The native object does not exist.");
return 0;
}
return joint->m_setting.m_damping;
return joint->m_setting.m_impulseClamp;
}
/*
@ -127,13 +127,13 @@ extern "C" {
*/
JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_joints_Point2PointJoint_getTau
(JNIEnv * env, jobject object, jlong jointId) {
btPoint2PointConstraint* joint = reinterpret_cast<btPoint2PointConstraint*>(jointId);
btPoint2PointConstraint* joint = reinterpret_cast<btPoint2PointConstraint*> (jointId);
if (joint == NULL) {
jclass newExc = env->FindClass("java/lang/NullPointerException");
env->ThrowNew(newExc, "The native object does not exist.");
return 0;
}
return joint->m_setting.m_damping;
return joint->m_setting.m_tau;
}
/*

4
jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_motors_TranslationalLimitMotor.cpp
Unescape View File

@ -141,9 +141,9 @@ extern "C" {
* Method: getLimitSoftness
* Signature: (J)F
*/
JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_joints_motors_TranslationalLimitMotor_getLetLimitSoftness
JNIEXPORT jfloat JNICALL Java_com_jme3_bullet_joints_motors_TranslationalLimitMotor_getLimitSoftness
(JNIEnv *env, jobject object, jlong motorId) {
btTranslationalLimitMotor* motor = reinterpret_cast<btTranslationalLimitMotor*>(motorId);
btTranslationalLimitMotor* motor = reinterpret_cast<btTranslationalLimitMotor*> (motorId);
if (motor == NULL) {
jclass newExc = env->FindClass("java/lang/NullPointerException");
env->ThrowNew(newExc, "The native object does not exist.");

81
jme3-examples/src/main/java/jme3test/bullet/TestIssue918.java
Unescape View File

@ -0,0 +1,81 @@
/*
* Copyright (c) 2018 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* * 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,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package jme3test.bullet;
import com.jme3.app.SimpleApplication;
import com.jme3.bullet.collision.shapes.CollisionShape;
import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.joints.Point2PointJoint;
import com.jme3.bullet.objects.PhysicsRigidBody;
import com.jme3.math.Vector3f;
/**
* Test case for JME issue #918: Point2PointJoint.getImpulseClamp() and
* .getTau() return the damping value instead. The bug existed in Native Bullet
* only.
* <p>
* If successful, no UnsatisfiedLinkError exception will be thrown.
*/
public class TestIssue918 extends SimpleApplication {
// *************************************************************************
// new methods exposed
public static void main(String[] args) {
TestIssue918 app = new TestIssue918();
app.start();
}
// *************************************************************************
// SimpleApplication methods
@Override
public void simpleInitApp() {
CollisionShape capsule = new SphereCollisionShape(1f);
PhysicsRigidBody body1 = new PhysicsRigidBody(capsule, 1f);
PhysicsRigidBody body2 = new PhysicsRigidBody(capsule, 1f);
Vector3f pivot1 = new Vector3f();
Vector3f pivot2 = new Vector3f();
Point2PointJoint joint
= new Point2PointJoint(body1, body2, pivot1, pivot2);
joint.setImpulseClamp(42f);
joint.setTau(99f);
if (joint.getImpulseClamp() != 42f) {
throw new RuntimeException();
}
if (joint.getTau() != 99f) {
throw new RuntimeException();
}
stop();
}
}

72
jme3-examples/src/main/java/jme3test/bullet/TestIssue919.java
Unescape View File

@ -0,0 +1,72 @@
/*
* Copyright (c) 2018 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* * 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,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package jme3test.bullet;
import com.jme3.app.SimpleApplication;
import com.jme3.bullet.collision.shapes.CollisionShape;
import com.jme3.bullet.collision.shapes.SphereCollisionShape;
import com.jme3.bullet.joints.SixDofJoint;
import com.jme3.bullet.objects.PhysicsRigidBody;
import com.jme3.math.Vector3f;
/**
* Test case for JME issue #919: native implementation of
* TranslationalLimitMotor.getLimitSoftness() has wrong name. The bug existed in
* Native Bullet only.
* <p>
* If successful, no UnsatisfiedLinkError exception will be thrown.
*/
public class TestIssue919 extends SimpleApplication {
// *************************************************************************
// new methods exposed
public static void main(String[] args) {
TestIssue919 app = new TestIssue919();
app.start();
}
// *************************************************************************
// SimpleApplication methods
@Override
public void simpleInitApp() {
CollisionShape capsule = new SphereCollisionShape(1f);
PhysicsRigidBody body1 = new PhysicsRigidBody(capsule, 1f);
PhysicsRigidBody body2 = new PhysicsRigidBody(capsule, 1f);
Vector3f pivot1 = new Vector3f();
Vector3f pivot2 = new Vector3f();
SixDofJoint joint = new SixDofJoint(body1, body2, pivot1, pivot2, true);
joint.getTranslationalLimitMotor().getLimitSoftness();
stop();
}
}
Write Preview
Loading…
Cancel
Save