parent
1c5373876e
commit
f71aad128a
@ -117,7 +117,7 @@ extern "C" {
|
|||||||
env->ThrowNew(newExc, "The native object does not exist.");
|
env->ThrowNew(newExc, "The native object does not exist.");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return joint->m_setting.m_damping;
|
return joint->m_setting.m_impulseClamp;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -133,7 +133,7 @@ extern "C" {
|
|||||||
env->ThrowNew(newExc, "The native object does not exist.");
|
env->ThrowNew(newExc, "The native object does not exist.");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return joint->m_setting.m_damping;
|
return joint->m_setting.m_tau;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -141,7 +141,7 @@ extern "C" {
|
|||||||
* Method: getLimitSoftness
|
* Method: getLimitSoftness
|
||||||
* Signature: (J)F
|
* 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) {
|
(JNIEnv *env, jobject object, jlong motorId) {
|
||||||
btTranslationalLimitMotor* motor = reinterpret_cast<btTranslationalLimitMotor*> (motorId);
|
btTranslationalLimitMotor* motor = reinterpret_cast<btTranslationalLimitMotor*> (motorId);
|
||||||
if (motor == NULL) {
|
if (motor == NULL) {
|
||||||
|
@ -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();
|
||||||
|
}
|
||||||
|
}
|
@ -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();
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user