android head tracking

compiles, doesn't work yet... how to debug java code?
zilongshanren · Jun 8, 2016 · 7e5d6ad · 7e5d6ad
1 parent cbf5f64
commit 7e5d6ad
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java
@@ -618,7 +618,7 @@ public static float[] getSensorRotationMatrix() {
         float[] inclinationM = new float[16];
         float[] gravs = new float[3];
         float[] geoMags = new float[3];
-        SensorManager.getRotationMatrix(rotationMatrix, inclimationMatrix, gravs, geoMags);
+        SensorManager.getRotationMatrix(rotationM, inclinationM, gravs, geoMags);
         return rotationM;
     }
 }
diff --git a/cocos/platform/android/jni/JniHelper.h b/cocos/platform/android/jni/JniHelper.h
@@ -132,20 +132,29 @@ class CC_DLL JniHelper
     }
 
     template <typename... Ts>
-    static jfloatArray callStaticFloatArrayMethod(const std::string& className, 
+    static float* callStaticFloatArrayMethod(const std::string& className, 
                                        const std::string& methodName, 
                                        Ts... xs) {
-        jfloatArray ret;
+        static float ret[32];
         cocos2d::JniMethodInfo t;
         std::string signature = "(" + std::string(getJNISignature(xs...)) + ")[F";
         if (cocos2d::JniHelper::getStaticMethodInfo(t, className.c_str(), methodName.c_str(), signature.c_str())) {
-            ret = (jfloatArray) t.env->CallStaticObjectMethod(t.classID, t.methodID, convert(t, xs)...);
+            jfloatArray array = (jfloatArray) t.env->CallStaticObjectMethod(t.classID, t.methodID, convert(t, xs)...);
+            jsize len = t.env->GetArrayLength(array);
+            if (len <= 32) {
+                jfloat* elems = t.env->GetFloatArrayElements(array, 0);
+                if (elems) {
+                    memcpy(ret, elems, sizeof(float) * len);
+                    t.env->ReleaseFloatArrayElements(array, elems, 0);
+                };
+            }
             t.env->DeleteLocalRef(t.classID);
             deleteLocalRefs(t.env);
+            return &ret[0];
         } else {
             reportError(className, methodName, signature);
         }
-        return ret;
+        return nullptr;
     }
 
     template <typename... Ts>

diff --git a/cocos/vr/CCVRGenericHeadTracker.cpp b/cocos/vr/CCVRGenericHeadTracker.cpp
@@ -64,6 +64,7 @@ static Mat4 matrixFromRotationMatrix(const CMRotationMatrix& rotationMatrix)
                 0.0f,
                 1.0f);
 }
+#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
 
 static Mat4 getRotateEulerMatrix(float x, float y, float z)
 {
@@ -97,7 +98,6 @@ static Mat4 getRotateEulerMatrix(float x, float y, float z)
     matrix.m[15] = 1.0f;
     return matrix;
 }
-#endif
 
 VRGenericHeadTracker::VRGenericHeadTracker()
 : _localPosition(Vec3::ZERO)
@@ -144,7 +144,8 @@ void VRGenericHeadTracker::startTracking()
     // the inertial reference frame has z up and x forward, while the world has z out and x right
     _worldToInertialReferenceFrame = getRotateEulerMatrix(-90.f, 0.f, 90.f);
 #elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
-
+    _deviceToDisplay = getRotateEulerMatrix(0.f, 0.f, -90.f);
+    _worldToInertialReferenceFrame = getRotateEulerMatrix(-90.f, 0.f, 90.f);
 #endif
 }
 
@@ -176,8 +177,9 @@ Mat4 VRGenericHeadTracker::getLocalRotation()
     static const std::string helperClassName = "org/cocos2dx/lib/Cocos2dxHelper";
     auto rotMatrix = JniHelper::callStaticFloatArrayMethod(helperClassName, "getSensorRotationMatrix");
 
-    Mat4 ret(rotMatrix);
-    return ret;
+    Mat4 inertialReferenceFrameToDevice(rotMatrix);
+    Mat4 worldToDevice =  inertialReferenceFrameToDevice * _worldToInertialReferenceFrame;
+    return  _deviceToDisplay * worldToDevice;
 #else
     return Mat4::IDENTITY;
 #endif

diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp
@@ -180,7 +180,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     _testController = TestController::getInstance();
 
     glview->setVREnabled(true);
-    
+
     return true;
 }