From 8644280eb541918a431005f05aa6781c4fb73970 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 26 Feb 2014 12:11:03 -0800
Subject: [PATCH] Make sure our mode is fully established before we use the
 mirror camera to render the billboard.  Closes #2103.

---
 interface/src/Application.cpp | 3 +--
 interface/src/Camera.cpp      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4c34e35dc7..371a9e0c54 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1852,8 +1852,7 @@ void Application::init() {
     _myCamera.setModeShiftPeriod(1.0f);
 
     _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
-    _mirrorCamera.setAspectRatio((float)MIRROR_VIEW_WIDTH / (float)MIRROR_VIEW_HEIGHT);
-    _mirrorCamera.setFieldOfView(30);
+    _mirrorCamera.setModeShiftPeriod(0.0f);
 
     OculusManager::connect();
     if (OculusManager::isConnected()) {
diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp
index be7e7bac50..6cb44f5919 100644
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@@ -126,7 +126,7 @@ void Camera::setModeShiftPeriod (float period) {
     
     // if a zero period was requested, we clearly want to snap immediately to the target
     if (period == 0.0f) {
-        update(MIN_PERIOD);
+        update(MAX_PERIOD);
     }
 }