GVR SDK for Unity v1.100.0

Assets/GoogleVR/Scripts/Controller/Internal/ControllerProviders/MouseControllerProvider.cs

@@ -23,9 +23,12 @@ namespace Gvr.Internal {
   /// The right mouse button is used for the appButton.
   /// The middle mouse button is used for the homeButton.
   class MouseControllerProvider : IControllerProvider {
+    private const string AXIS_MOUSE_X = "Mouse X";
+    private const string AXIS_MOUSE_Y = "Mouse Y";
+
     private ControllerState state = new ControllerState();
 
-    private Vector3 lastMousePosition;
+    private Vector2 mouseDelta = new Vector2();
 
     /// Need to store the state of the buttons from the previous frame.
     /// This is because Input.GetMouseButtonDown and Input.GetMouseButtonUp
@@ -35,8 +38,8 @@ class MouseControllerProvider : IControllerProvider {
     private bool wasHomeButton;
     private bool wasTouching;
 
-    private const float ROTATE_SENSITIVITY = 0.075f;
-    private const float TOUCH_SENSITIVITY = 0.002f;
+    private const float ROTATE_SENSITIVITY = 4.5f;
+    private const float TOUCH_SENSITIVITY = .12f;
     private static readonly Vector3 INVERT_Y = new Vector3(1, -1, 1);
 
     public static bool IsMouseAvailable {
@@ -95,9 +98,10 @@ public void OnPause() {}
     public void OnResume() {}
 
     private void UpdateState() {
+      GvrCursorHelper.ControllerEmulationActive = IsMouseAvailable;
+
       if (!IsMouseAvailable) {
         ClearState();
-        lastMousePosition = Input.mousePosition;
         return;
       }
 
@@ -108,19 +112,20 @@ private void UpdateState() {
 
       UpdateButtonStates();
 
+      mouseDelta.Set(
+        Input.GetAxis(AXIS_MOUSE_X),
+        Input.GetAxis(AXIS_MOUSE_Y)
+      );
+
       if (state.isTouching) {
         UpdateTouchPos();
       } else {
         UpdateOrientation();
       }
-
-      lastMousePosition = Input.mousePosition;
     }
 
     private void UpdateTouchPos() {
       Vector3 currentMousePosition = Input.mousePosition;
-      Vector3 mouseDelta = currentMousePosition - lastMousePosition;
-
       Vector2 touchDelta = mouseDelta * TOUCH_SENSITIVITY;
       touchDelta.y *= -1.0f;
 
@@ -130,7 +135,6 @@ private void UpdateTouchPos() {
     }
 
     private void UpdateOrientation() {
-      Vector3 mouseDelta = Input.mousePosition - lastMousePosition;
       Vector3 deltaDegrees = Vector3.Scale(mouseDelta, INVERT_Y) * ROTATE_SENSITIVITY;
 
       state.gyro = deltaDegrees * (Mathf.Deg2Rad / Time.deltaTime);

Assets/GoogleVR/Scripts/GvrEditorEmulator.cs

@@ -67,6 +67,7 @@ void Update() {
 
     bool rolled = false;
     if (CanChangeYawPitch()) {
+      GvrCursorHelper.HeadEmulationActive = true;
       mouseX += Input.GetAxis(AXIS_MOUSE_X) * 5;
       if (mouseX <= -180) {
         mouseX += 360;
@@ -76,9 +77,12 @@ void Update() {
       mouseY -= Input.GetAxis(AXIS_MOUSE_Y) * 2.4f;
       mouseY = Mathf.Clamp(mouseY, -85, 85);
     } else if (CanChangeRoll()) {
+      GvrCursorHelper.HeadEmulationActive = true;
       rolled = true;
       mouseZ += Input.GetAxis(AXIS_MOUSE_X) * 5;
       mouseZ = Mathf.Clamp(mouseZ, -85, 85);
+    } else {
+      GvrCursorHelper.HeadEmulationActive = false;
     }
 
     if (!rolled) {

Assets/GoogleVR/Scripts/GvrUnitySdkVersion.cs

@@ -15,7 +15,7 @@
 using UnityEngine;
 
 /// <summary>
-/// Provides and logs versioning information for the GVR Unity SDK.
+/// Provides and logs versioning information for the GVR SDK for Unity.
 /// </summary>
 public class GvrUnitySdkVersion {
   public const string GVR_SDK_VERSION = "1.100.0";
@@ -27,7 +27,7 @@ public class GvrUnitySdkVersion {
 
 // Only log GVR SDK version when running on an Android or iOS device.
 #if (UNITY_ANDROID || UNITY_IOS) && !UNITY_EDITOR
-  private const string VERSION_HEADER = "GVR Unity SDK Version: ";
+  private const string VERSION_HEADER = "GVR SDK for Unity version: ";
 
   [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
   static void LogGvrUnitySdkVersion() {

Assets/GoogleVR/Scripts/Utilities/GvrCursorHelper.cs

@@ -0,0 +1,48 @@
+// Copyright 2017 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissioßns and
+// limitations under the License.
+
+using System;
+using UnityEngine;
+
+namespace Gvr.Internal {
+  /// Manages cursor lock state while developer is using editor head and controller emulation.
+  public class GvrCursorHelper {
+
+    // Whether MouseControllerProvider is currently tracking mouse movement.
+    private static bool cachedHeadEmulationActive;
+
+    // Whether GvrEditorEmulator is currently tracking mouse movement.
+    private static bool cachedControllerEmulationActive;
+
+    public static bool HeadEmulationActive {
+      set {
+        cachedHeadEmulationActive = value;
+        UpdateCursorLockState();
+      }
+    }
+
+    public static bool ControllerEmulationActive {
+      set {
+        cachedControllerEmulationActive = value;
+        UpdateCursorLockState();
+      }
+    }
+
+    private static void UpdateCursorLockState() {
+      bool active = cachedHeadEmulationActive || cachedControllerEmulationActive;
+      Cursor.lockState = active ? CursorLockMode.Locked : CursorLockMode.None;
+    }
+
+  }
+}

README.md

@@ -11,14 +11,14 @@ For first time users, see the Get Started Guides for [Android Cardboard](https:/
 
 Please note, we do not accept pull requests.
 
-## Migration to Unity 5.6 from GVR Unity SDK 1.40 or lower
-__Unity versions 5.6 or newer are required as of v1.40 of the GVR Unity SDK.__
+## Migration to Unity 5.6 from GVR SDK for Unity 1.40 or lower
+__Unity versions 5.6 or newer are required as of v1.40 of the GVR SDK for Unity.__
 
 Migration steps:
 
-1. Update the GVR Unity SDK to [1.40](https://github.com/googlevr/gvr-unity-sdk/blob/a3d1033260dab57cb0f4a62a770796fbd09fe37a/GoogleVRForUnity.unitypackage).
+1. Update the GVR SDK for Unity to [1.40](https://github.com/googlevr/gvr-unity-sdk/blob/a3d1033260dab57cb0f4a62a770796fbd09fe37a/GoogleVRForUnity.unitypackage).
 2. Migrate to Unity 5.6.0f3, or any newer version. The SDK will import or remove the unnecessary GVR libraries.
-3. Update the GVR Unity SDK to 1.70 (or latest).
+3. Update the GVR SDK for Unity to 1.70 (or latest).
 
 ## Usage Guide
 As of the 1.70 release, the `gvr-unity-sdk` git repo can be cloned and used directly in a Unity project.
@@ -27,8 +27,8 @@ As of the 1.70 release, the `gvr-unity-sdk` git repo can be cloned and used dire
 * __Samples__: [Daydream Elements](https://github.com/googlevr/daydream-elements)
 * __Workflow__: [Instant Preview](https://github.com/googlevr/gvr-instant-preview)
 
-## Pod update to the latest GVR iOS SDK
-As of Unity 5.6, the generated Cocoapod can be updated to the latest GVR iOS SDK by following these steps.
+## Pod update to the latest GVR SDK for iOS
+As of Unity 5.6, the generated Cocoapod can be updated to the latest GVR SDK for iOS by following these steps.
 
 * Build an XCode project from Unity.
 * In a terminal, change directories into the XCode project folder.