From 224b0a377a2df7bb56b925330f81bc42399e0b6e Mon Sep 17 00:00:00 2001 From: Xoppa Date: Thu, 6 Jun 2013 22:14:47 +0200 Subject: [PATCH] Add managed const ptr, remove unneeded upcast --- .../gdx/physics/bullet/btCollisionObjectArray.java | 5 ++--- .../com/badlogic/gdx/physics/bullet/btRigidBody.java | 5 ----- .../com/badlogic/gdx/physics/bullet/gdxBulletJNI.java | 1 - extensions/gdx-bullet/jni/swig-src/gdxBullet_wrap.cpp | 15 --------------- extensions/gdx-bullet/jni/swig/custom/btRigidBody.i | 3 +++ extensions/gdx-bullet/jni/swig/gdxManagedObject.i | 4 ++-- 6 files changed, 7 insertions(+), 26 deletions(-) diff --git a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btCollisionObjectArray.java b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btCollisionObjectArray.java index f1e051b8e..99e7f2510 100755 --- a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btCollisionObjectArray.java +++ b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btCollisionObjectArray.java @@ -53,9 +53,8 @@ public class btCollisionObjectArray { } public btCollisionObject at(int n) { - long cPtr = gdxBulletJNI.btCollisionObjectArray_at__SWIG_0(swigCPtr, this, n); - return (cPtr == 0) ? null : new btCollisionObject(cPtr, false); - } + return btCollisionObject.getInstance(gdxBulletJNI.btCollisionObjectArray_at__SWIG_0(swigCPtr, this, n), false); +} public void clear() { gdxBulletJNI.btCollisionObjectArray_clear(swigCPtr, this); diff --git a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btRigidBody.java b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btRigidBody.java index 0c1ec6a98..bc77d762e 100755 --- a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btRigidBody.java +++ b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/btRigidBody.java @@ -56,11 +56,6 @@ public class btRigidBody extends btCollisionObject { gdxBulletJNI.btRigidBody_proceedToTransform(swigCPtr, this, newTrans); } - public static btRigidBody upcast(btCollisionObject colObj) { - long cPtr = gdxBulletJNI.btRigidBody_upcast__SWIG_0(btCollisionObject.getCPtr(colObj), colObj); - return (cPtr == 0) ? null : new btRigidBody(cPtr, false); - } - public void predictIntegratedTransform(float step, Matrix4 predictedTransform) { gdxBulletJNI.btRigidBody_predictIntegratedTransform(swigCPtr, this, step, predictedTransform); } diff --git a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/gdxBulletJNI.java b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/gdxBulletJNI.java index d96b443f1..5cc7c2a5d 100755 --- a/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/gdxBulletJNI.java +++ b/extensions/gdx-bullet/jni/swig-src/com/badlogic/gdx/physics/bullet/gdxBulletJNI.java @@ -1897,7 +1897,6 @@ public class gdxBulletJNI { public final static native long new_btRigidBody__SWIG_2(float jarg1, long jarg2, btMotionState jarg2_, long jarg3, btCollisionShape jarg3_); public final static native void delete_btRigidBody(long jarg1); public final static native void btRigidBody_proceedToTransform(long jarg1, btRigidBody jarg1_, Matrix4 jarg2); - public final static native long btRigidBody_upcast__SWIG_0(long jarg1, btCollisionObject jarg1_); public final static native void btRigidBody_predictIntegratedTransform(long jarg1, btRigidBody jarg1_, float jarg2, Matrix4 jarg3); public final static native void btRigidBody_saveKinematicState(long jarg1, btRigidBody jarg1_, float jarg2); public final static native void btRigidBody_applyGravity(long jarg1, btRigidBody jarg1_); diff --git a/extensions/gdx-bullet/jni/swig-src/gdxBullet_wrap.cpp b/extensions/gdx-bullet/jni/swig-src/gdxBullet_wrap.cpp index 1d9dd2d3f..f54734ca7 100755 --- a/extensions/gdx-bullet/jni/swig-src/gdxBullet_wrap.cpp +++ b/extensions/gdx-bullet/jni/swig-src/gdxBullet_wrap.cpp @@ -35063,21 +35063,6 @@ SWIGEXPORT void JNICALL Java_com_badlogic_gdx_physics_bullet_gdxBulletJNI_btRigi } -SWIGEXPORT jlong JNICALL Java_com_badlogic_gdx_physics_bullet_gdxBulletJNI_btRigidBody_1upcast_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { - jlong jresult = 0 ; - btCollisionObject *arg1 = (btCollisionObject *) 0 ; - btRigidBody *result = 0 ; - - (void)jenv; - (void)jcls; - (void)jarg1_; - arg1 = *(btCollisionObject **)&jarg1; - result = (btRigidBody *)btRigidBody::upcast((btCollisionObject const *)arg1); - *(btRigidBody **)&jresult = result; - return jresult; -} - - SWIGEXPORT void JNICALL Java_com_badlogic_gdx_physics_bullet_gdxBulletJNI_btRigidBody_1predictIntegratedTransform(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jfloat jarg2, jobject jarg3) { btRigidBody *arg1 = (btRigidBody *) 0 ; btScalar arg2 ; diff --git a/extensions/gdx-bullet/jni/swig/custom/btRigidBody.i b/extensions/gdx-bullet/jni/swig/custom/btRigidBody.i index d40a158a9..a952386bf 100644 --- a/extensions/gdx-bullet/jni/swig/custom/btRigidBody.i +++ b/extensions/gdx-bullet/jni/swig/custom/btRigidBody.i @@ -58,6 +58,9 @@ struct btRigidBodyConstructionInfo %nestedworkaround btRigidBody::btRigidBodyConstructionInfo; +%ignore btRigidBody::upcast(const btCollisionObject*); +%ignore btRigidBody::upcast(btCollisionObject*); + %{ #include %} diff --git a/extensions/gdx-bullet/jni/swig/gdxManagedObject.i b/extensions/gdx-bullet/jni/swig/gdxManagedObject.i index 62c13d356..43daf9ecc 100644 --- a/extensions/gdx-bullet/jni/swig/gdxManagedObject.i +++ b/extensions/gdx-bullet/jni/swig/gdxManagedObject.i @@ -5,11 +5,11 @@ * @author Xoppa */ %define CREATE_MANAGED_OBJECT(_TYPE) -%typemap(javaout) _TYPE *, const _TYPE * { +%typemap(javaout) _TYPE *, const _TYPE *, _TYPE * const & { return _TYPE.getInstance($jnicall, $owner); } -%typemap(javadirectorin) _TYPE *, const _TYPE * "_TYPE.getInstance($1, false)" +%typemap(javadirectorin) _TYPE *, const _TYPE *, _TYPE * const & "_TYPE.getInstance($1, false)" %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") _TYPE %{ { beforeDelete(); -- 2.11.0