GVR Unity SDK public_1.0.1_20160929_RC006

Author: cyisrael

GoogleVR/Scripts/GvrSettings.cs

@@ -18,7 +18,7 @@
 /// </summary>
 
 // This class is defined only for versions of Unity with the GVR native integration.
-#if UNITY_HAS_GOOGLEVR && UNITY_ANDROID
+#if UNITY_HAS_GOOGLEVR && (UNITY_ANDROID || UNITY_EDITOR)
 using UnityEngine;
 using UnityEngine.VR;
 using System;
@@ -153,4 +153,4 @@ private static void SetSustainedPerformanceMode(bool enabled) {
   private static extern int gvr_user_prefs_get_controller_handedness(IntPtr gvrUserPrefsPtr);
 
 }
-#endif  // UNITY_HAS_GOOGLEVR && UNITY_ANDROID
+#endif  // UNITY_HAS_GOOGLEVR && (UNITY_ANDROID || UNITY_EDITOR)

GoogleVR/Scripts/GvrViewer.cs

@@ -86,16 +86,23 @@ public static StereoController Controller {
 
   /// Determine whether the scene renders in stereo or mono.
   /// Supported only for versions of Unity *without* the GVR integration.
+  /// VRModeEnabled will be a no-op for versions of Unity with the GVR integration.
   /// _True_ means to render in stereo, and _false_ means to render in mono.
   public bool VRModeEnabled {
     get {
+#if !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
       return vrModeEnabled;
+#else
+      return UnityEngine.VR.VRSettings.enabled;
+#endif  // !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
     }
     set {
+#if !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
       if (value != vrModeEnabled && device != null) {
         device.SetVRModeEnabled(value);
       }
       vrModeEnabled = value;
+#endif  // !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
     }
   }
   [SerializeField]
@@ -212,7 +219,7 @@ public float StereoScreenScale {
   public RenderTexture StereoScreen {
     get {
       // Don't need it except for distortion correction.
-      if (!distortionCorrectionEnabled || !vrModeEnabled) {
+      if (!distortionCorrectionEnabled || !VRModeEnabled) {
         return null;
       }
       if (stereoScreen == null) {
@@ -346,7 +353,9 @@ private void InitDevice() {
 
     device.SetNeckModelScale(neckModelScale);
 
+#if !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
     device.SetVRModeEnabled(vrModeEnabled);
+#endif  // !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
 
     device.UpdateScreenData();
   }
@@ -522,7 +531,9 @@ void OnApplicationQuit() {
   }
 
   void OnDestroy() {
+#if !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
     VRModeEnabled = false;
+#endif  // !UNITY_HAS_GOOGLEVR || UNITY_EDITOR
     if (device != null) {
       device.Destroy();
     }

GoogleVR/Scripts/Utilities/GvrFPS.cs

@@ -42,8 +42,9 @@ void Start() {
   }
 
   void LateUpdate() {
-    float interp = Time.deltaTime / (0.5f + Time.deltaTime);
-    float currentFPS = 1.0f / Time.deltaTime;
+    float deltaTime = Time.unscaledDeltaTime;
+    float interp = deltaTime / (0.5f + deltaTime);
+    float currentFPS = 1.0f / deltaTime;
     fps = Mathf.Lerp(fps, currentFPS, interp);
     float msf = MS_PER_SEC / fps;
     textField.text = string.Format(DISPLAY_TEXT_FORMAT,