GVR Unity SDK v0.9.0

GoogleVR/Distortion/GvrDistortion.cginc

@@ -71,9 +71,12 @@ float4 undistortVertex(float4 pos) {
 }
 
 // Surface shader hides away the MVP multiplication, so we have
-// to multiply by _FixProjection = inverse(MVP)*_RealProjection.
+// to multiply by _FixProjection = inverse(VP)*_RealProjection
+// and then by inverse(M), in order to cancel it out and leave our
+// own transform in place.
 float4 undistortSurface(float4 pos) {
-  return mul(_FixProjection, undistort(pos));
+  float4 proj = mul(_FixProjection, undistort(pos));
+  return mul(_World2Object, proj);
 }
 
 #else

GoogleVR/Legacy/Scripts/Internal/GvrEye.cs

@@ -88,7 +88,7 @@ void Start() {
     // Save reference to the found controller and it's camera.
     controller = ctlr;
     monoCamera = controller.GetComponent<Camera>();
-    UpdateStereoValues();
+    SetupStereo(/*forceUpdate=*/true);
   }
 
   public void UpdateStereoValues() {
@@ -135,24 +135,24 @@ public void UpdateStereoValues() {
     }
   }
 
-  private void SetupStereo() {
+  private void SetupStereo(bool forceUpdate) {
     GvrViewer.Instance.UpdateState();
 
+    bool updateValues = forceUpdate  // Being called from Start(), most likely.
+        || controller.keepStereoUpdated  // Parent camera may be animating.
+        || GvrViewer.Instance.ProfileChanged  // New QR code.
+        || cam.targetTexture == null
+            && GvrViewer.Instance.StereoScreen != null ;  // Need to (re)assign targetTexture.
+    if (updateValues) {
+      // Set projection, viewport and targetTexture.
+      UpdateStereoValues();
+    }
+
     // Will need to update view transform if there is a COI, or if there is a remnant of
     // prior stereo-adjustment smoothing to finish off.
     bool haveCOI = controller.centerOfInterest != null
         && controller.centerOfInterest.gameObject.activeInHierarchy;
-    bool updatePosition = haveCOI || interpPosition < 1;
-
-    if (controller.keepStereoUpdated || GvrViewer.Instance.ProfileChanged
-        || cam.targetTexture == null && GvrViewer.Instance.StereoScreen != null) {
-      // Set projection and viewport.
-      UpdateStereoValues();
-      // Also view transform.
-      updatePosition = true;
-    }
-
-    if (updatePosition) {
+    if (updateValues || haveCOI || interpPosition < 1) {
       // Set view transform.
       float proj11 = cam.projectionMatrix[1, 1];
       float zScale = transform.lossyScale.z;
@@ -183,7 +183,7 @@ void OnPreCull() {
       cam.enabled = false;
       return;
     }
-    SetupStereo();
+    SetupStereo(/*forceUpdate=*/false);
     if (!controller.directRender && GvrViewer.Instance.StereoScreen != null) {
       // Some image effects clobber the whole screen.  Add a final image effect to the chain
       // which restores side-by-side stereo.

GoogleVR/Legacy/Scripts/Internal/VRDevices/BaseVRDevice.cs

@@ -42,7 +42,6 @@ protected BaseVRDevice() {
     public abstract void SetDistortionCorrectionEnabled(bool enabled);
 
     public abstract void SetNeckModelScale(float scale);
-    public abstract void SetElectronicDisplayStabilizationEnabled(bool enabled);
 
     public virtual bool SupportsNativeDistortionCorrection(List<string> diagnostics) {
       return true;
@@ -146,7 +145,6 @@ public Rect GetViewport(GvrViewer.Eye eye,
     protected int leftEyeOrientation;
     protected int rightEyeOrientation;
 
-    public bool triggered;
     public bool tilted;
     public bool profileChanged;
     public bool backButtonPressed;

GoogleVR/Legacy/Scripts/Internal/VRDevices/EditorDevice.cs

@@ -46,7 +46,6 @@ public override bool SupportsNativeUILayer(List<string> diagnostics) {
     public override void SetVRModeEnabled(bool enabled) {}
     public override void SetDistortionCorrectionEnabled(bool enabled) {}
     public override void SetNeckModelScale(float scale) {}
-    public override void SetElectronicDisplayStabilizationEnabled(bool enabled) {}
 
     private Quaternion initialRotation = Quaternion.identity;
 
@@ -91,7 +90,6 @@ public override void UpdateState() {
       var neck = (rot * neckOffset - neckOffset.y * Vector3.up) * GvrViewer.Instance.NeckModelScale;
       headPose.Set(neck, rot);
 
-      triggered = Input.GetMouseButtonDown(0);
       tilted = Input.GetKeyUp(KeyCode.Escape);
     }