Fix stupid bug in pooling

diff --git a/extensions/gdx-bullet/jni/swig/common/gdxDefault.i b/extensions/gdx-bullet/jni/swig/common/gdxDefault.i
index 33a83a0..720bb96 100644 (file)
--- a/extensions/gdx-bullet/jni/swig/common/gdxDefault.i
+++ b/extensions/gdx-bullet/jni/swig/common/gdxDefault.i
@@ -13,6 +13,13 @@
                construct();
        }
        
+       @Override
+       protected void reset(long cPtr, boolean cMemoryOwn) {
+               if (!destroyed)
+                       destroy();
+               super.reset(swigCPtr = cPtr, cMemoryOwn);
+       }
+       
        public static long getCPtr($javaclassname obj) {
                return (obj == null) ? 0 : obj.swigCPtr;
        }
@@ -31,6 +38,13 @@
                construct();
        }
        
+       @Override
+       protected void reset(long cPtr, boolean cMemoryOwn) {
+               if (!destroyed)
+                       destroy();
+               super.reset($imclassname.$javaclazznameSWIGUpcast(swigCPtr = cPtr), cMemoryOwn);
+       }
+       
        public static long getCPtr($javaclassname obj) {
                return (obj == null) ? 0 : obj.swigCPtr;
        }

diff --git a/extensions/gdx-bullet/jni/swig/common/gdxPooledObject.i b/extensions/gdx-bullet/jni/swig/common/gdxPooledObject.i
index 3c4a50e..1516f4e 100644 (file)
--- a/extensions/gdx-bullet/jni/swig/common/gdxPooledObject.i
+++ b/extensions/gdx-bullet/jni/swig/common/gdxPooledObject.i
@@ -51,7 +51,7 @@
          
          static jmethodID reuseMethod = NULL;
          if (reuseMethod == NULL)
-                 reuseMethod = (jmethodID) jenv->GetMethodID(clazz, "reuse", "(JZ)V");
+                 reuseMethod = (jmethodID) jenv->GetMethodID(clazz, "reset", "(JZ)V");
          
          long ptr;
          *(const void **)&ptr = cPtr;

diff --git a/extensions/gdx-bullet/jni/swig/gdxBullet.i b/extensions/gdx-bullet/jni/swig/gdxBullet.i
index 1729ed9..a928928 100644 (file)
--- a/extensions/gdx-bullet/jni/swig/gdxBullet.i
+++ b/extensions/gdx-bullet/jni/swig/gdxBullet.i
@@ -16,6 +16,7 @@
 %ignore btManifoldPoint::getPositionWorldOnB;\r
 %ignore btManifoldPoint::getAppliedImpulse;\r
 %ignore btSolverBody::getWorldTransform;\r
+%ignore btSolverBody::setWorldTransform;\r
 %ignore btSolverBody::getDeltaLinearVelocity;\r
 %ignore btSolverBody::getDeltaAngularVelocity;\r
 %ignore btSolverBody::getPushVelocity;\r
@@ -43,10 +44,6 @@
 \r
 %include "common/gdxPooledObject.i"\r
 \r
-//%include "common/gdxManagedObject.i"\r
-\r
-/* Prefer libgdx's linear math types (Vector3, Matrix3, etc.). */\r
-%include "common/gdxMathTypes.i"\r
 \r
 /* Map "void *" to "jlong". */\r
 // %include "gdxVoidPointer.i";\r
@@ -58,7 +55,6 @@
 /* Include Java imports for all the types we'll need in all extensions/custom types. */\r
 %include "common/gdxJavaImports.i"\r
 \r
-\r
 %{\r
 #include <stdint.h>\r
 %}\r
@@ -74,6 +70,23 @@
  */\r
 %include "common/btTransform.i"\r
 \r
+%{\r
+#include <LinearMath/btVector3.h>\r
+%}\r
+%include <LinearMath/btVector3.h>\r
+\r
+%{\r
+#include <LinearMath/btQuaternion.h>\r
+%}\r
+%include <LinearMath/btQuaternion.h>\r
+\r
+\r
+\r
+//%include "common/gdxManagedObject.i"\r
+\r
+/* Prefer libgdx's linear math types (Vector3, Matrix3, etc.). */\r
+%include "common/gdxMathTypes.i"\r
+\r
 /* Configure directors for types with virtual methods that need Java implementations */\r
 %feature("director") btIDebugDraw;\r
 \r
@@ -87,21 +100,11 @@
  */\r
 \r
 %{\r
-#include <LinearMath/btVector3.h>\r
-%}\r
-%include <LinearMath/btVector3.h>\r
-\r
-%{\r
 #include <LinearMath/btQuadWord.h>\r
 %}\r
 #include <LinearMath/btQuadWord.h>\r
 \r
 %{\r
-#include <LinearMath/btQuaternion.h>\r
-%}\r
-%include <LinearMath/btQuaternion.h>\r
-\r
-%{\r
 #include <LinearMath/btMatrix3x3.h>\r
 %}\r
 #include <LinearMath/btMatrix3x3.h>\r