Bladeren bron

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

Stephen Gold 6 jaren geleden
bovenliggende
commit
b5cb4c0c13

+ 1 - 1
.gitignore

@@ -23,7 +23,7 @@
 /jme3-core/src/main/resources/com/jme3/system/version.properties
 /jme3-*/build/
 /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-android-native/openal-soft/
 /jme3-android-native/OpenALSoft.zip

+ 2 - 2
gradle.properties

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

+ 12 - 0
jme3-bullet-native/build.gradle

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

+ 1 - 1
jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_HingeJoint.cpp

@@ -85,7 +85,7 @@ extern "C" {
             env->ThrowNew(newExc, "The native object does not exist.");
             return 0;
         }
-        return joint->getMotorTargetVelosity();
+        return joint->getMotorTargetVelocity();
     }
 
     /*