From 60c33c18c397c70bc753fc8ba4329c414ee235e5 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Tue, 24 Jun 2014 20:32:41 -0700
Subject: [PATCH] Expose mode shift period to JS, remove default value

---
 examples/inspect.js      | 2 ++
 interface/src/Camera.cpp | 2 --
 interface/src/Camera.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/inspect.js b/examples/inspect.js
index b292d5f609..a4ff405c3f 100644
--- a/examples/inspect.js
+++ b/examples/inspect.js
@@ -195,6 +195,8 @@ function keyReleaseEvent(event) {
     }
 }
 
+
+
 function mousePressEvent(event) {
     if (alt && !isActive) {
         mouseLastX = event.x;
diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp
index 0e33e14f32..4490b60fc9 100644
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@@ -317,8 +317,6 @@ void CameraScriptableObject::setMode(const QString& mode) {
     }
     if (currentMode != targetMode) {
         _camera->setMode(targetMode);
-        const float DEFAULT_MODE_SHIFT_PERIOD = 0.5f; // half second
-        _camera->setModeShiftPeriod(DEFAULT_MODE_SHIFT_PERIOD);
     }
 }
 
diff --git a/interface/src/Camera.h b/interface/src/Camera.h
index 5e189c1111..2bbbf0e751 100644
--- a/interface/src/Camera.h
+++ b/interface/src/Camera.h
@@ -42,9 +42,8 @@ public:
     void setTargetPosition(const glm::vec3& t);
     void setTightness(float t) { _tightness = t; }
     void setTargetRotation(const glm::quat& rotation);
-    
-    void setMode(CameraMode m);
     void setModeShiftPeriod(float r);
+    void setMode(CameraMode m);
     void setFieldOfView(float f);
     void setAspectRatio(float a);
     void setNearClip(float n);
@@ -130,6 +129,7 @@ public:
 public slots:
     QString getMode() const;
     void setMode(const QString& mode);
+    void setModeShiftPeriod(float r) {_camera->setModeShiftPeriod(r); }
     void setPosition(const glm::vec3& value) { _camera->setTargetPosition(value);}
 
     glm::vec3 getPosition() const { return _camera->getPosition(); }