Switch code from Oculus SDK to Google SDK

Author: Sameer Padala

.gitignore

@@ -1,6 +1,7 @@
 *.iml
 .gradle
 /local.properties
+/.idea/misc.xml
 /.idea/workspace.xml
 /.idea/libraries
 /.idea/caches

app/CMakeLists.txt

@@ -24,7 +24,6 @@ add_library( # Sets the name of the library.
              src/main/cpp/udp.cpp
              src/main/cpp/nal.cpp
              src/main/cpp/vr_context.cpp
-             src/main/cpp/render.cpp
              src/main/cpp/latency_collector.cpp
              src/main/cpp/fec.cpp
              src/main/cpp/asset.cpp
@@ -57,7 +56,7 @@ target_link_libraries( # Specifies the target library.
                        # included in the NDK.
                        ${log-lib}
 
-                       vrapi
+                       gvr
                        GLESv3
                        EGL
                        android

app/build.gradle

@@ -11,7 +11,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                cppFlags ""
+                cppFlags "-std=gnu++11"
             }
         }
     }
@@ -79,4 +79,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     ARCoreImplementation('com.google.ar:core:1.2.1')
+    implementation 'com.google.vr:sdk-base:1.160.0'
 }

app/src/ARCore/java/com/polygraphene/alvr/ArThread.java

@@ -66,7 +66,7 @@ public void start() {
         super.startBase();
     }
 
-    public static void requestPermissions(MainActivity activity) {
+    public static void requestPermissions(AlvrActivity activity) {
         ActivityCompat.requestPermissions(
                 activity, new String[]{Manifest.permission.CAMERA}, RC_PERMISSIONS);
     }
@@ -87,7 +87,7 @@ public String getErrorMessage() {
         return mErrorMessage;
     }
 
-    public void initialize(MainActivity activity) {
+    public void initialize(AlvrActivity activity) {
         try {
             Session session = createArSession(activity, mInstallRequested);
             if (session == null) {
@@ -161,7 +161,7 @@ public void run() {
         }
     }
 
-    private Session createArSession(MainActivity activity, boolean installRequested)
+    private Session createArSession(AlvrActivity activity, boolean installRequested)
             throws UnavailableException {
         Session session = null;
         // if we have the camera permission, create the session
@@ -185,23 +185,23 @@ private Session createArSession(MainActivity activity, boolean installRequested)
     /**
      * Check to see we have the necessary permissions for this app.
      */
-    private static boolean hasCameraPermission(MainActivity activity) {
+    private static boolean hasCameraPermission(AlvrActivity activity) {
         return ContextCompat.checkSelfPermission(activity, Manifest.permission.CAMERA)
                 == PackageManager.PERMISSION_GRANTED;
     }
 
     /**
      * Check to see if we need to show the rationale for this permission.
      */
-    private static boolean shouldShowRequestPermissionRationale(MainActivity activity) {
+    private static boolean shouldShowRequestPermissionRationale(AlvrActivity activity) {
         return ActivityCompat.shouldShowRequestPermissionRationale(
                 activity, Manifest.permission.CAMERA);
     }
 
     /**
      * Launch Application Setting to grant permission.
      */
-    private void launchPermissionSettings(MainActivity activity) {
+    private void launchPermissionSettings(AlvrActivity activity) {
         Intent intent = new Intent();
         intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
         intent.setData(Uri.fromParts("package", activity.getPackageName(), null));
@@ -223,7 +223,7 @@ private void handleSessionException(UnavailableException sessionException) {
         }
     }
 
-    public static boolean onRequestPermissionsResult(MainActivity activity) {
+    public static boolean onRequestPermissionsResult(AlvrActivity activity) {
         if (!hasCameraPermission(activity)) {
             Toast.makeText(
                     activity, "Camera permission is needed to run this application", Toast.LENGTH_LONG)
@@ -260,7 +260,7 @@ private void makeContext(EGLContext shareContext) {
         }
     }
 
-    public void debugReadPixel(MainActivity activity) {
+    public void debugReadPixel(AlvrActivity activity) {
         //Generate a new FBO. It will contain your texture.
         int fb[] = new int[1];
         GLES11Ext.glGenFramebuffersOES(1, IntBuffer.wrap(fb));

app/src/ARCore/java/com/polygraphene/alvr/Constants.java

@@ -1,5 +1,5 @@
 package com.polygraphene.alvr;
 
 public class Constants {
-    public static final boolean IS_ARCORE_BUILD = true;
+    public static final boolean IS_ARCORE_BUILD = false;
 }

app/src/ARCore/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">ALVR (ARCore)</string>
+    <string name="ovr_name">ALVR (OVR + ARCore)</string>
+    <string name="dd_name">ALVR (Daydream)</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -3,35 +3,53 @@
     package="com.polygraphene.alvr"
     android:installLocation="auto">
 
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />
     <uses-feature
-        android:glEsVersion="0x00030001"
+        android:glEsVersion="0x00030002"
         android:required="true" />
     <uses-permission android:name="android.permission.INTERNET" />
+
+    <!-- Functionality required for Daydream. All OculusVR devices should have these features. -->
+    <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
+    <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
+    <!-- Most OculusVR devices won't have these features. -->
+    <uses-feature android:name="android.software.vr.mode" android:required="true"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="true"/>
+
+
+    <uses-feature
+        android:name="android.hardware.vr.headtracking"
+        android:version="1"
+        android:required="false"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/ovr_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <meta-data
-            android:name="com.samsung.android.vr.application.mode"
-            android:value="vr_only" />
-
-        <activity
-            android:name="com.polygraphene.alvr.MainActivity"
-            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode|density"
-            android:excludeFromRecents="true"
-            android:icon="@mipmap/ic_launcher"
-            android:launchMode="singleTask"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
+
+        <!--
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only" />
+        -->
+
+        <activity android:name=".DaydreamLayersActivity"
+                  android:label="@string/dd_name"
+                  android:screenOrientation="landscape"
+                  android:configChanges="orientation|keyboardHidden|screenSize|uiMode|navigation|density"
+                  android:enableVrMode="@string/gvr_vr_mode_component"
+                  android:resizeableActivity="false">
+            <!-- Metadata used to tell DD about this Activity. -->
+            <meta-data android:name="com.google.android.vr.icon"
+                       android:resource="@drawable/daydream_icon" />
+            <meta-data android:name="com.google.android.vr.icon_background"
+                       android:resource="@drawable/daydream_background" />
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="${filter}" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="com.google.intent.category.DAYDREAM" />
             </intent-filter>
         </activity>
     </application>

app/src/main/cpp/gltf_model.cpp

@@ -8,7 +8,6 @@
 
 #include "tinygltf/tiny_gltf.h"
 #include "utils.h"
-#include "render.h"
 
 void GltfModel::load() {
     tinygltf::TinyGLTF loader;
@@ -55,10 +54,8 @@ void GltfModel::drawScene(int position, int uv,
 
     GL(glBindVertexArray(m_vao));
 
-    ovrMatrix4f transform = ovrMatrix4f_CreateIdentity();
 
     for (auto node_i : scene.nodes) {
-        drawNodeTree(node_i, transform);
     }
 
     GL(glBindVertexArray(0));
@@ -67,13 +64,6 @@ void GltfModel::drawScene(int position, int uv,
 void GltfModel::drawNodeTree(int node_i, const ovrMatrix4f &transform) {
     auto &node = m_model.nodes[node_i];
 
-    ovrMatrix4f nodeTransform = createNodeTrasform(transform, node);
-
-    drawNode(node_i, nodeTransform);
-
-    for (auto &child_i : node.children) {
-        drawNodeTree(child_i, nodeTransform);
-    }
 }
 
 void GltfModel::drawNode(int node_i, const ovrMatrix4f &transform) {
@@ -177,26 +167,3 @@ void GltfModel::drawNode(int node_i, const ovrMatrix4f &transform) {
         GL(glDisableVertexAttribArray(m_position));
     }
 }
-
-ovrMatrix4f
-GltfModel::createNodeTrasform(const ovrMatrix4f &baseTransform, const tinygltf::Node &node) {
-    ovrMatrix4f nodeTransform = baseTransform;
-    if(node.translation.size() == 3) {
-        ovrMatrix4f translation = ovrMatrix4f_CreateTranslation(node.translation[0], node.translation[1], node.translation[2]);
-        nodeTransform = ovrMatrix4f_Multiply(&nodeTransform, &translation);
-    }
-    if(node.rotation.size() == 4) {
-        ovrQuatf q;
-        q.x = node.rotation[0];
-        q.y = node.rotation[1];
-        q.z = node.rotation[2];
-        q.w = node.rotation[3];
-        ovrMatrix4f rotation = ovrMatrix4f_CreateFromQuaternion(&q);
-        nodeTransform = ovrMatrix4f_Multiply(&nodeTransform, &rotation);
-    }
-    if(node.scale.size() == 3) {
-        ovrMatrix4f scale = ovrMatrix4f_CreateScale(node.scale[0], node.scale[1], node.scale[2]);
-        nodeTransform = ovrMatrix4f_Multiply(&nodeTransform, &scale);
-    }
-    return nodeTransform;
-}

app/src/main/cpp/gltf_model.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 #include <GLES3/gl3.h>
-#include <VrApi_Types.h>
+#include "utils.h"
 
 #define TINYGLTF_NO_STB_IMAGE_WRITE
 #include "tinygltf/tiny_gltf.h"
@@ -23,7 +23,6 @@ class GltfModel {
 
     void drawNodeTree(int node_i, const ovrMatrix4f &transform);
     void drawNode(int node_i, const ovrMatrix4f &transform);
-    ovrMatrix4f createNodeTrasform(const ovrMatrix4f &baseTransform, const tinygltf::Node &node);
 public:
     void load();
     void drawScene(int position, int uv, int normal, GLint color, GLint mMatrix, GLint mode);