From d3e7d2037482f330df3ca08829b7f9f92a94685f Mon Sep 17 00:00:00 2001
From: Stephen Gold <sgold@sonic.net>
Date: Thu, 29 Nov 2018 13:48:37 -0800
Subject: [PATCH] upgrade native Bullet to v2.87, which should fix issue #877

---
 .gitignore                                           |  2 +-
 gradle.properties                                    |  4 ++--
 jme3-bullet-native/build.gradle                      | 12 ++++++++++++
 .../native/cpp/com_jme3_bullet_joints_HingeJoint.cpp |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03507b678..e8f636ab3 100644
--- a/.gitignore
+++ b/.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
diff --git a/gradle.properties b/gradle.properties
index 51a19ff05..421294cb8 100644
--- a/gradle.properties
+++ b/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
diff --git a/jme3-bullet-native/build.gradle b/jme3-bullet-native/build.gradle
index 55273f09e..a6c346d0a 100644
--- a/jme3-bullet-native/build.gradle
+++ b/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'
                     }
                 }
diff --git a/jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_HingeJoint.cpp b/jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_HingeJoint.cpp
index 48ba90f37..351be3ffa 100644
--- a/jme3-bullet-native/src/native/cpp/com_jme3_bullet_joints_HingeJoint.cpp
+++ b/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();
     }
 
     /*