diff --git a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h index bc5762dcc..8eb2f34de 100644 --- a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h +++ b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h @@ -13,8 +13,6 @@ extern "C" { #define com_jme3_bullet_PhysicsSpace_AXIS_Y 1L #undef com_jme3_bullet_PhysicsSpace_AXIS_Z #define com_jme3_bullet_PhysicsSpace_AXIS_Z 2L -/* Inaccessible static: pQueueTL */ -/* Inaccessible static: physicsSpaceTL */ /* * Class: com_jme3_bullet_PhysicsSpace * Method: createPhysicsSpace diff --git a/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h new file mode 100644 index 000000000..04eb0f45f --- /dev/null +++ b/engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h @@ -0,0 +1,13 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_jme3_bullet_PhysicsSpace_BroadphaseType */ + +#ifndef _Included_com_jme3_bullet_PhysicsSpace_BroadphaseType +#define _Included_com_jme3_bullet_PhysicsSpace_BroadphaseType +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif diff --git a/engine/src/bullet-native/jmeBulletUtil.cpp b/engine/src/bullet-native/jmeBulletUtil.cpp index e6f085ceb..b584b83c0 100644 --- a/engine/src/bullet-native/jmeBulletUtil.cpp +++ b/engine/src/bullet-native/jmeBulletUtil.cpp @@ -307,7 +307,7 @@ void jmeBulletUtil::convertQuat(JNIEnv* env, const btMatrix3x3* in, jobject out) } } -void jmeBulletUtil::addResult(JNIEnv* env, jobject resultlist, btVector3 hitnormal, btVector3 m_hitPointWorld, btScalar m_hitFraction, btCollisionObject* hitobject) { +void jmeBulletUtil::addResult(JNIEnv* env, jobject resultlist, btVector3 hitnormal, btVector3 m_hitPointWorld, btScalar m_hitFraction, const btCollisionObject* hitobject) { jobject singleresult = env->AllocObject(jmeClasses::PhysicsRay_Class); jobject hitnormalvec = env->AllocObject(jmeClasses::Vector3f); diff --git a/engine/src/bullet-native/jmeBulletUtil.h b/engine/src/bullet-native/jmeBulletUtil.h index ab7bea360..9ec758201 100644 --- a/engine/src/bullet-native/jmeBulletUtil.h +++ b/engine/src/bullet-native/jmeBulletUtil.h @@ -45,7 +45,7 @@ public: static void convert(JNIEnv* env, const btMatrix3x3* in, jobject out); static void convertQuat(JNIEnv* env, jobject in, btMatrix3x3* out); static void convertQuat(JNIEnv* env, const btMatrix3x3* in, jobject out); - static void addResult(JNIEnv* env, jobject resultlist, const btVector3 hitnormal,const btVector3 m_hitPointWorld,const btScalar m_hitFraction,btCollisionObject* hitobject); + static void addResult(JNIEnv* env, jobject resultlist, const btVector3 hitnormal,const btVector3 m_hitPointWorld,const btScalar m_hitFraction,const btCollisionObject* hitobject); private: jmeBulletUtil(){}; ~jmeBulletUtil(){};