From bd4fe416b4335e8eb6b5ae0280913646d91496c1 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 12 Jul 2017 12:04:37 -0700
Subject: [PATCH] Cleanup; no magic numbers for default cam params

---
 interface/src/SecondaryCamera.h   |  6 +++---
 scripts/system/spectatorCamera.js | 12 +-----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/interface/src/SecondaryCamera.h b/interface/src/SecondaryCamera.h
index 0fa24a7637..0941959c0a 100644
--- a/interface/src/SecondaryCamera.h
+++ b/interface/src/SecondaryCamera.h
@@ -40,9 +40,9 @@ public:
     QUuid attachedEntityId{};
     glm::vec3 position{};
     glm::quat orientation{};
-    float vFoV{ 45.0f };
-    float nearClipPlaneDistance{ 0.1f };
-    float farClipPlaneDistance{ 16384.0f };
+    float vFoV{ DEFAULT_FIELD_OF_VIEW_DEGREES };
+    float nearClipPlaneDistance{ DEFAULT_NEAR_CLIP };
+    float farClipPlaneDistance{ DEFAULT_FAR_CLIP };
     SecondaryCameraJobConfig() : render::Task::Config(false) {}
 signals:
     void dirty();
diff --git a/scripts/system/spectatorCamera.js b/scripts/system/spectatorCamera.js
index bd090e27ca..bc975f59dd 100644
--- a/scripts/system/spectatorCamera.js
+++ b/scripts/system/spectatorCamera.js
@@ -46,11 +46,7 @@
     //      -Far clip plane distance
     //   -viewFinderOverlay: The in-world overlay that displays the spectator camera's view.
     //   -camera: The in-world entity that corresponds to the spectator camera.
-    //   -cameraIsDynamic: "false" for now while we figure out why dynamic, parented overlays
-    //    drift with respect to their parent.
-    //   -vFoV: The vertical field of view of the spectator camera.
-    //   -nearClipPlaneDistance: The near clip plane distance of the spectator camera (aka "camera").
-    //   -farClipPlaneDistance: The far clip plane distance of the spectator camera.
+    //   -cameraIsDynamic: "false" for now - maybe it shouldn't be? False means that the camera won't drift when you let go...
     //   -cameraRotation: The rotation of the spectator camera.
     //   -cameraPosition: The position of the spectator camera.
     //   -glassPaneWidth: The width of the glass pane above the spectator camera that holds the viewFinderOverlay.
@@ -61,9 +57,6 @@
     var viewFinderOverlay = false;
     var camera = false;
     var cameraIsDynamic = false;
-    var vFoV = 45.0;
-    var nearClipPlaneDistance = 0.1;
-    var farClipPlaneDistance = 16384.0;
     var cameraRotation;
     var cameraPosition;
     var glassPaneWidth = 0.16;
@@ -75,9 +68,6 @@
         // Sets the special texture size based on the window it is displayed in, which doesn't include the menu bar
         spectatorCameraConfig.enableSecondaryCameraRenderConfigs(true);
         spectatorCameraConfig.resetSizeSpectatorCamera(Window.innerWidth, Window.innerHeight);
-        spectatorCameraConfig.vFoV = vFoV;
-        spectatorCameraConfig.nearClipPlaneDistance = nearClipPlaneDistance;
-        spectatorCameraConfig.farClipPlaneDistance = farClipPlaneDistance;
         cameraRotation = MyAvatar.orientation, cameraPosition = inFrontOf(1, Vec3.sum(MyAvatar.position, { x: 0, y: 0.3, z: 0 }));
         camera = Entities.addEntity({
             "angularDamping": 1,