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

upgrade native Bullet to v2.87, which should fix issue #877

Browse Source
This commit is contained in:
Stephen Gold 2018-11-29 13:48:37 -08:00
parent 3d63433b28
commit d3e7d20374
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -23,7 +23,7 @@
/jme3-core/src/main/resources/com/jme3/system/version.properties /jme3-core/src/main/resources/com/jme3/system/version.properties
/jme3-*/build/ /jme3-*/build/
/jme3-bullet-native/bullet3.zip /jme3-bullet-native/bullet3.zip
/jme3-bullet-native/bullet3-2.86.1/ /jme3-bullet-native/bullet3-2.87/
/jme3-bullet-native/src/native/cpp/com_jme3_bullet_*.h /jme3-bullet-native/src/native/cpp/com_jme3_bullet_*.h
/jme3-android-native/openal-soft/ /jme3-android-native/openal-soft/
/jme3-android-native/OpenALSoft.zip /jme3-android-native/OpenALSoft.zip

4
gradle.properties
View File

@ -19,8 +19,8 @@ buildAndroidExamples = false
ndkPath = /opt/android-ndk-r16b ndkPath = /opt/android-ndk-r16b
# Path for downloading native Bullet # Path for downloading native Bullet
bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.86.1.zip bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.87.zip
bulletFolder = bullet3-2.86.1 bulletFolder = bullet3-2.87
bulletZipFile = bullet3.zip bulletZipFile = bullet3.zip
# POM settings # POM settings

12
jme3-bullet-native/build.gradle
View File

@ -21,6 +21,10 @@ task cleanHeaders(type: Delete) {
task cleanUnzipped(type: Delete) { task cleanUnzipped(type: Delete) {
delete bulletFolder delete bulletFolder
} }
// clean up the downloaded archive
task cleanZipFile(type: Delete) {
delete bulletZipFile
}
model { model {
components { components {
@ -37,13 +41,21 @@ model {
source { source {
srcDir 'src/native/cpp' srcDir 'src/native/cpp'
srcDir bulletSrcPath srcDir bulletSrcPath
exclude 'Bullet3Collision/**'
exclude 'Bullet3Dynamics/**'
exclude 'Bullet3Geometry/**'
exclude 'Bullet3OpenCL/**' exclude 'Bullet3OpenCL/**'
exclude 'Bullet3Serialize/**'
include '**/*.cpp' include '**/*.cpp'
} }
exportedHeaders { exportedHeaders {
srcDir 'src/native/cpp' srcDir 'src/native/cpp'
srcDir bulletSrcPath srcDir bulletSrcPath
exclude 'Bullet3Collision/**'
exclude 'Bullet3Dynamics/**'
exclude 'Bullet3Geometry/**'
exclude 'Bullet3OpenCL/**' exclude 'Bullet3OpenCL/**'
exclude 'Bullet3Serialize/**'
include '**/*.h' include '**/*.h'
} }
} }

2
jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_HingeJoint.cpp
View File

@ -85,7 +85,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->getMotorTargetVelosity(); return joint->getMotorTargetVelocity();
} }
/* /*