Updated oculus stuff

Assets/Oculus/Platform/Editor/GUIHelper.cs

@@ -0,0 +1,45 @@
+namespace Oculus.Platform
+{
+  using UnityEditor;
+  using UnityEngine;
+
+  class GUIHelper {
+    public delegate void Worker();
+
+    static void InOut(Worker begin, Worker body, Worker end) {
+      try {
+        begin();
+        body();
+      } finally {
+        end();
+      }
+    }
+
+    public static void HInset(int pixels, Worker worker) {
+      InOut( 
+        () => {
+          GUILayout.BeginHorizontal();
+          GUILayout.Space(pixels);
+          GUILayout.BeginVertical();
+        },
+        worker,
+        () => {
+          GUILayout.EndVertical();
+          GUILayout.EndHorizontal();
+        }
+      );
+    }
+
+    public delegate T ControlWorker<T>();
+    public static T MakeControlWithLabel<T>(GUIContent label, ControlWorker<T> worker) {
+      EditorGUILayout.BeginHorizontal();
+      EditorGUILayout.LabelField(label);
+
+      var result = worker();
+
+      EditorGUILayout.EndHorizontal();
+      return result;
+    }
+  }
+
+}

Assets/Oculus/Platform/Editor/GUIHelper.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 19bb2c637ba6e9c459e3db36b2ec10c3
+timeCreated: 1523486797
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Oculus/Platform/Editor/OculusPlatformSettingsEditor.cs

@@ -0,0 +1,251 @@
+namespace Oculus.Platform
+{
+  using System;
+  using UnityEditor;
+  using UnityEngine;
+
+  // This classes implements a UI to edit the PlatformSettings class.
+  // The UI is accessible from a the menu bar via: Oculus Platform -> Edit Settings
+  [CustomEditor(typeof(PlatformSettings))]
+  public class OculusPlatformSettingsEditor : Editor
+  {
+    private bool isUnityEditorSettingsExpanded;
+    private bool isBuildSettingsExpanded;
+
+    private WWW getAccessTokenRequest;
+
+    private void OnEnable()
+    {
+      isUnityEditorSettingsExpanded = PlatformSettings.UseStandalonePlatform;
+#if UNITY_ANDROID
+      isBuildSettingsExpanded = true;
+#else
+      isBuildSettingsExpanded = false;
+#endif
+    }
+
+    [UnityEditor.MenuItem("Oculus Platform/Edit Settings")]
+    public static void Edit()
+    {
+      UnityEditor.Selection.activeObject = PlatformSettings.Instance;
+    }
+
+    public override void OnInspectorGUI()
+    {
+      //
+      // Application IDs section
+      //
+      GUIContent riftAppIDLabel = new GUIContent("Oculus Rift App Id [?]", "This AppID will be used when building to the Windows target.");
+      GUIContent gearAppIDLabel = new GUIContent("Gear VR App Id [?]", "This AppID will be used when building to the Android target");
+      PlatformSettings.AppID = MakeTextBox(riftAppIDLabel, PlatformSettings.AppID);
+      PlatformSettings.MobileAppID = MakeTextBox(gearAppIDLabel, PlatformSettings.MobileAppID);
+
+      if (GUILayout.Button("Create / Find your app on https://dashboard.oculus.com"))
+      {
+        UnityEngine.Application.OpenURL("https://dashboard.oculus.com/");
+      }
+
+#if UNITY_ANDROID
+      if (String.IsNullOrEmpty(PlatformSettings.MobileAppID))
+      {
+        EditorGUILayout.HelpBox("Please enter a valid Gear VR App ID.", MessageType.Error);
+      }
+      else
+      {
+        var msg = "Configured to connect with App ID " + PlatformSettings.MobileAppID;
+        EditorGUILayout.HelpBox(msg, MessageType.Info);
+      }
+#else
+      if (String.IsNullOrEmpty(PlatformSettings.AppID))
+      {
+        EditorGUILayout.HelpBox("Please enter a valid Oculus Rift App ID.", MessageType.Error);
+      }
+      else
+      {
+        var msg = "Configured to connect with App ID " + PlatformSettings.AppID;
+        EditorGUILayout.HelpBox(msg, MessageType.Info);
+      }
+#endif
+      EditorGUILayout.Separator();
+
+      //
+      // Unity Editor Settings section
+      //
+      isUnityEditorSettingsExpanded = EditorGUILayout.Foldout(isUnityEditorSettingsExpanded, "Unity Editor Settings");
+      if (isUnityEditorSettingsExpanded)
+      {
+        GUIHelper.HInset(6, () =>
+        {
+          bool HasTestAccessToken = !String.IsNullOrEmpty(StandalonePlatformSettings.OculusPlatformTestUserAccessToken);
+          if (PlatformSettings.UseStandalonePlatform)
+          {
+            if (!HasTestAccessToken && 
+            (String.IsNullOrEmpty(StandalonePlatformSettings.OculusPlatformTestUserEmail) ||
+            String.IsNullOrEmpty(StandalonePlatformSettings.OculusPlatformTestUserPassword)))
+            {
+              EditorGUILayout.HelpBox("Please enter a valid user credentials.", MessageType.Error);
+            }
+            else
+            {
+              var msg = "The Unity editor will use the supplied test user credentials and operate in standalone mode.  Some user data will be mocked.";
+              EditorGUILayout.HelpBox(msg, MessageType.Info);
+            }
+          }
+          else
+          {
+            var msg = "The Unity editor will use the user credentials from the Oculus application.";
+            EditorGUILayout.HelpBox(msg, MessageType.Info);
+          }
+
+          var useStandaloneLabel = "Use Standalone Platform [?]";
+          var useStandaloneHint = "If this is checked your app will use a debug platform with the User info below.  "
+            + "Otherwise your app will connect to the Oculus Platform.  This setting only applies to the Unity Editor";
+          PlatformSettings.UseStandalonePlatform =
+            MakeToggle(new GUIContent(useStandaloneLabel, useStandaloneHint), PlatformSettings.UseStandalonePlatform);
+
+          GUI.enabled = PlatformSettings.UseStandalonePlatform;
+
+          if (!HasTestAccessToken)
+          {
+            var emailLabel = "Test User Email: ";
+            var emailHint = "Test users can be configured at " +
+              "https://dashboard.oculus.com/organizations/<your org ID>/testusers " +
+              "however any valid Oculus account email may be used.";
+            StandalonePlatformSettings.OculusPlatformTestUserEmail =
+              MakeTextBox(new GUIContent(emailLabel, emailHint), StandalonePlatformSettings.OculusPlatformTestUserEmail);
+
+            var passwdLabel = "Test User Password: ";
+            var passwdHint = "Password associated with the email address.";
+            StandalonePlatformSettings.OculusPlatformTestUserPassword =
+              MakePasswordBox(new GUIContent(passwdLabel, passwdHint), StandalonePlatformSettings.OculusPlatformTestUserPassword);
+
+            var isLoggingIn = (getAccessTokenRequest != null);
+            var loginLabel = (!isLoggingIn) ? "Login" : "Logging in...";
+
+            GUI.enabled = !isLoggingIn;
+            if (GUILayout.Button(loginLabel))
+            {
+              WWWForm form = new WWWForm();
+              var headers = form.headers;
+              headers.Add("Authorization", "Bearer OC|1141595335965881|");
+              form.AddField("email", StandalonePlatformSettings.OculusPlatformTestUserEmail);
+              form.AddField("password", StandalonePlatformSettings.OculusPlatformTestUserPassword);
+
+              // Start the WWW request to get the access token
+              getAccessTokenRequest = new WWW("https://graph.oculus.com/login", form.data, headers);
+              EditorApplication.update += GetAccessToken;
+            }
+            GUI.enabled = true;
+          }
+          else
+          {
+            var loggedInMsg = "Currently using the credentials associated with " + StandalonePlatformSettings.OculusPlatformTestUserEmail;
+            EditorGUILayout.HelpBox(loggedInMsg, MessageType.Info);
+
+            var logoutLabel = "Clear Credentials";
+
+            if (GUILayout.Button(logoutLabel))
+            {
+              StandalonePlatformSettings.OculusPlatformTestUserAccessToken = "";
+            }
+          }
+
+          GUI.enabled = true;
+        });
+      }
+      EditorGUILayout.Separator();
+
+      //
+      // Build Settings section
+      //
+      isBuildSettingsExpanded = EditorGUILayout.Foldout(isBuildSettingsExpanded, "Build Settings");
+      if (isBuildSettingsExpanded)
+      {
+        GUIHelper.HInset(6, () => {
+          if (!PlayerSettings.virtualRealitySupported)
+          {
+            EditorGUILayout.HelpBox("VR Support isn't enabled in the Player Settings", MessageType.Warning);
+          }
+          else
+          {
+            EditorGUILayout.HelpBox("VR Support is enabled", MessageType.Info);
+          }
+
+          PlayerSettings.virtualRealitySupported = MakeToggle(new GUIContent("Virtual Reality Support"), PlayerSettings.virtualRealitySupported);
+          PlayerSettings.bundleVersion = MakeTextBox(new GUIContent("Bundle Version"), PlayerSettings.bundleVersion);
+#if UNITY_5_3 || UNITY_5_4 || UNITY_5_5
+          PlayerSettings.bundleIdentifier = MakeTextBox(new GUIContent("Bundle Identifier"), PlayerSettings.bundleIdentifier);
+#else
+          BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+          PlayerSettings.SetApplicationIdentifier(
+            buildTargetGroup,
+            MakeTextBox(
+              new GUIContent("Bundle Identifier"),
+              PlayerSettings.GetApplicationIdentifier(buildTargetGroup)));
+#endif
+        });
+      }
+      EditorGUILayout.Separator();
+    }
+
+    // Asyncronously fetch the access token with the given credentials
+    private void GetAccessToken()
+    {
+      if (getAccessTokenRequest != null && getAccessTokenRequest.isDone)
+      {
+
+        // Clear the password
+        StandalonePlatformSettings.OculusPlatformTestUserPassword = "";
+
+        if (String.IsNullOrEmpty(getAccessTokenRequest.error))
+        {
+          var Response = JsonUtility.FromJson<OculusStandalonePlatformResponse>(getAccessTokenRequest.text);
+          StandalonePlatformSettings.OculusPlatformTestUserAccessToken = Response.access_token;
+        }
+        
+        GUI.changed = true;
+        EditorApplication.update -= GetAccessToken;
+        getAccessTokenRequest = null;
+      }
+    }
+
+    private string MakeTextBox(GUIContent label, string variable)
+    {
+      return GUIHelper.MakeControlWithLabel(label, () => {
+        GUI.changed = false;
+        var result = EditorGUILayout.TextField(variable);
+        SetDirtyOnGUIChange();
+        return result;
+      });
+    }
+    private string MakePasswordBox(GUIContent label, string variable)
+    {
+      return GUIHelper.MakeControlWithLabel(label, () => {
+        GUI.changed = false;
+        var result = EditorGUILayout.PasswordField(variable);
+        SetDirtyOnGUIChange();
+        return result;
+      });
+    }
+
+
+    private bool MakeToggle(GUIContent label, bool variable)
+    {
+      return GUIHelper.MakeControlWithLabel(label, () => {
+        GUI.changed = false;
+        var result = EditorGUILayout.Toggle(variable);
+        SetDirtyOnGUIChange();
+        return result;
+      });
+    }
+
+    private void SetDirtyOnGUIChange()
+    {
+      if (GUI.changed)
+      {
+        EditorUtility.SetDirty(PlatformSettings.Instance);
+        GUI.changed = false;
+      }
+    }
+  }
+}

Assets/Oculus/Platform/Editor/OculusPlatformSettingsEditor.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 03780432f190e734dba71a2337880cdb
+timeCreated: 1523486796
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Oculus/Platform/Editor/OculusStandalonePlatformResponse.cs

@@ -0,0 +1,10 @@
+namespace Oculus.Platform
+{
+  using System;
+
+  [Serializable]
+  public sealed class OculusStandalonePlatformResponse
+  {
+    public string access_token;
+  }
+}

Assets/Oculus/Platform/Editor/OculusStandalonePlatformResponse.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 81f0418e197774a4e8d643b56923cb90
+timeCreated: 1523486799
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: