sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix native bullet compiler error

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10680 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-06-29 18:23:38 +00:00
parent feb6b1a55a
commit 70eddd78a7
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h
View File

@ -13,8 +13,6 @@ extern "C" {
#define com_jme3_bullet_PhysicsSpace_AXIS_Y 1L #define com_jme3_bullet_PhysicsSpace_AXIS_Y 1L
#undef com_jme3_bullet_PhysicsSpace_AXIS_Z #undef com_jme3_bullet_PhysicsSpace_AXIS_Z
#define com_jme3_bullet_PhysicsSpace_AXIS_Z 2L #define com_jme3_bullet_PhysicsSpace_AXIS_Z 2L
/* Inaccessible static: pQueueTL */
/* Inaccessible static: physicsSpaceTL */
/* /*
* Class: com_jme3_bullet_PhysicsSpace * Class: com_jme3_bullet_PhysicsSpace
* Method: createPhysicsSpace * Method: createPhysicsSpace

13
engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h Normal file
View File

@ -0,0 +1,13 @@
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* 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

2
engine/src/bullet-native/jmeBulletUtil.cpp
View File

@ -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 singleresult = env->AllocObject(jmeClasses::PhysicsRay_Class);
jobject hitnormalvec = env->AllocObject(jmeClasses::Vector3f); jobject hitnormalvec = env->AllocObject(jmeClasses::Vector3f);

2
engine/src/bullet-native/jmeBulletUtil.h
View File

@ -45,7 +45,7 @@ public:
static void convert(JNIEnv* env, const btMatrix3x3* in, jobject out); static void convert(JNIEnv* env, const btMatrix3x3* in, jobject out);
static void convertQuat(JNIEnv* env, jobject in, btMatrix3x3* out); static void convertQuat(JNIEnv* env, jobject in, btMatrix3x3* out);
static void convertQuat(JNIEnv* env, const btMatrix3x3* in, jobject 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: private:
jmeBulletUtil(){}; jmeBulletUtil(){};
~jmeBulletUtil(){}; ~jmeBulletUtil(){};