Commit: 628a56b2f5b55f45cfbdd9dca83becb60afc1baa - MikuMikuStudio (git)

Main repository of MikuMikuStudio

Commit MetaInfo

• Revision: 628a56b2f5b55f45cfbdd9dca83becb60afc1baa (tree)
• Time: 2013-06-30 03:23:38
• Author: normen667 <normen667@75d0...>
• Commiter: normen667

Log Message

- fix native bullet compiler error

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10680 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

Change Summary

• modified: engine/src/bullet-native/com_jme3_bullet_PhysicsSpace.h
• add: engine/src/bullet-native/com_jme3_bullet_PhysicsSpace_BroadphaseType.h
• modified: engine/src/bullet-native/jmeBulletUtil.cpp
• modified: engine/src/bullet-native/jmeBulletUtil.h

Incremental Difference

--- 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

--- /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 <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

--- 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);

--- 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(){};