Refactor GearVRActivity.isLookingAt to LookDetector.isLookingAt

Author: Yuya Matsuo

library/src/main/java/org/meganekkovr/GearVRActivity.java

@@ -29,8 +29,6 @@ public class GearVRActivity extends VrActivity implements MeganekkoContext {
 
     private static native long nativeSetAppInterface(VrActivity act, String fromPackageNameString, String commandString, String uriString);
 
-    private static native boolean isLookingAt(long appPtr, long entityPointer, long geometryComponentPointer);
-
     private static native void getCenterViewRotation(long appPtr, float[] values);
 
     private static native void setClearColorBuffer(long appPtr, boolean clearColorBuffer);
@@ -65,6 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setAppPtr(appPtr);
 
         OVRApp.init(appPtr);
+        LookDetector.init(appPtr);
     }
 
     /**
@@ -178,16 +177,7 @@ public Context getContext() {
 
     @Override
     public boolean isLookingAt(Entity entity) {
-
-        if (!entity.isShown()) {
-            return false;
-        }
-
-        // Check if entity has geometry
-        GeometryComponent geometryComponent = entity.getComponent(GeometryComponent.class);
-        if (geometryComponent == null) return false;
-
-        return isLookingAt(getAppPtr(), entity.getNativePointer(), geometryComponent.getNativePointer());
+        return LookDetector.getInstance().isLookingAt(entity);
     }
 
     @Override

library/src/main/java/org/meganekkovr/LookDetector.java

@@ -0,0 +1,34 @@
+package org.meganekkovr;
+
+public class LookDetector {
+
+    private static LookDetector instance;
+    private final long appPtr;
+
+    private LookDetector(long appPtr) {
+        this.appPtr = appPtr;
+    }
+
+    public synchronized static void init(long appPtr) {
+        if (instance != null)
+            throw new IllegalStateException("init was called twice!");
+
+        instance = new LookDetector(appPtr);
+    }
+
+    public static LookDetector getInstance() {
+        return instance;
+    }
+
+    private static native boolean isLookingAt(long appPtr, long entityPtr, long geometryComponentPtr);
+
+    public boolean isLookingAt(Entity entity) {
+
+        if (!entity.isShown() || !entity.hasComponent(GeometryComponent.class)) {
+            return false;
+        }
+
+        GeometryComponent geometry = entity.getComponent(GeometryComponent.class);
+        return isLookingAt(appPtr, entity.getNativePointer(), geometry.getNativePointer());
+    }
+}

library/src/main/java/org/meganekkovr/LookDetectorComponent.java

@@ -32,6 +32,7 @@ public interface LookListener {
         void onLooking(Entity entity, FrameInput frame);
     }
 
+    private final LookDetector lookDetector = LookDetector.getInstance();
     private final LookListener lookListener;
     private boolean looking;
 
@@ -43,7 +44,7 @@ public LookDetectorComponent(LookListener lookListener) {
     public void update(FrameInput frame) {
 
         Entity entity = getEntity();
-        boolean isLookingNow = entity.getApp().isLookingAt(entity);
+        boolean isLookingNow = lookDetector.isLookingAt(entity);
 
         if (isLookingNow) {
 

library/src/main/java/org/meganekkovr/MeganekkoApp.java

@@ -149,7 +149,7 @@ public boolean onKeyMax(int keyCode, int repeatCount) {
      * @return {@code true} if user is looking at. Otherwise {@code false}.
      */
     public boolean isLookingAt(Entity entity) {
-        return context.isLookingAt(entity);
+        return LookDetector.getInstance().isLookingAt(entity);
     }
 
     /**

library/src/main/jni/GearVRActivity.cpp

@@ -17,7 +17,6 @@
 #include "Android/JniUtils.h"
 #include "Entity.h"
 #include "GeometryComponent.h"
-#include "LookDetection.h"
 #include "util/convert.h"
 #include <jni.h>
 
@@ -197,27 +196,6 @@ jlong Java_org_meganekkovr_GearVRActivity_nativeSetAppInterface(
                     uriString);
 }
 
-jboolean Java_org_meganekkovr_GearVRActivity_isLookingAt(JNIEnv *jni,
-                                                         jclass clazz,
-                                                         jlong appPtr,
-                                                         jlong entityPtr,
-                                                         jlong geoCompPtr) {
-  mgn::GearVRActivity *activity =
-      (mgn::GearVRActivity *)((App *)appPtr)->GetAppInterface();
-  Matrix4f centerM = activity->GetCenterEyeViewMatrix();
-
-  mgn::Entity *entity = reinterpret_cast<mgn::Entity *>(entityPtr);
-  Matrix4f m = entity->GetWorldModelMatrix();
-
-  mgn::GeometryComponent *geoComp =
-      reinterpret_cast<mgn::GeometryComponent *>(geoCompPtr);
-  GlGeometry geo = geoComp->GetGeometry();
-
-  mgn::IntersectRayBoundsResult result =
-      mgn::IntersectRayBounds(centerM, m, geo, false);
-  return result.intersected;
-}
-
 void Java_org_meganekkovr_GearVRActivity_getCenterViewRotation(
     JNIEnv *jni, jclass clazz, jlong appPtr, jfloatArray values) {
   mgn::GearVRActivity *activity =

library/src/main/jni/LookDetection.cpp library/src/main/jni/LookDetector.cpplibrary/src/main/jni/LookDetection.cpp renamed to library/src/main/jni/LookDetector.cpp

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "LookDetection.h"
+#include "LookDetector.h"
+#include "App.h"
+#include "GeometryComponent.h"
 
 using namespace OVR;
 
@@ -56,4 +58,27 @@ IntersectRayBoundsResult IntersectRayBounds(const Matrix4f &centerViewMatrix,
 
   return result;
 }
-}
+}
+
+extern "C" {
+
+jboolean Java_org_meganekkovr_LookDetector_isLookingAt(JNIEnv *jni,
+                                                       jclass clazz,
+                                                       jlong appPtr,
+                                                       jlong entityPtr,
+                                                       jlong geoCompPtr) {
+  App *app = reinterpret_cast<App *>(appPtr);
+  Matrix4f viewM = app->GetLastViewMatrix();
+
+  mgn::Entity *entity = reinterpret_cast<mgn::Entity *>(entityPtr);
+  Matrix4f modelM = entity->GetWorldModelMatrix();
+
+  mgn::GeometryComponent *geoComp =
+      reinterpret_cast<mgn::GeometryComponent *>(geoCompPtr);
+  GlGeometry geo = geoComp->GetGeometry();
+
+  mgn::IntersectRayBoundsResult result =
+      mgn::IntersectRayBounds(viewM, modelM, geo, false);
+  return result.intersected;
+}
+} // extern "C"

library/src/main/jni/LookDetection.h library/src/main/jni/LookDetector.hlibrary/src/main/jni/LookDetection.h renamed to library/src/main/jni/LookDetector.h

@@ -9,6 +9,7 @@
 import org.meganekkovr.Entity;
 import org.meganekkovr.FrameInput;
 import org.meganekkovr.JoyButton;
+import org.meganekkovr.LookDetector;
 import org.meganekkovr.LookDetectorComponent;
 import org.meganekkovr.Scene;
 import org.meganekkovr.SurfaceRendererComponent;
@@ -85,7 +86,7 @@ public void onLooking(Entity entity, FrameInput frame) {
     @Override
     public void update(FrameInput frame) {
 
-        if (getApp().isLookingAt(planeEntity)) {
+        if (LookDetector.getInstance().isLookingAt(planeEntity)) {
             planeRenderer.color = Color.RED;
         } else {
             planeRenderer.color = Color.YELLOW;
@@ -105,10 +106,11 @@ public void update(FrameInput frame) {
     }
 
     private void onSingleTouchDetected() {
-        if (getApp().isLookingAt(button)) {
+        LookDetector lookDetector = LookDetector.getInstance();
+        if (lookDetector.isLookingAt(button)) {
             MyApp app = (MyApp) getApp();
             app.onTapButton();
-        } else if (getApp().isLookingAt(videocam)) {
+        } else if (lookDetector.isLookingAt(videocam)) {
             MyApp app = (MyApp) getApp();
             app.onTapVideocam();
         }