From 9bcaa6d2566bde83fb2a8febeaf0724add76600c Mon Sep 17 00:00:00 2001 From: Patrick Manalich Date: Wed, 28 Jun 2017 12:10:16 -0700 Subject: [PATCH] Revert "Messing around, howard please refer the commit before this one" This reverts commit 1392297da9b2ee5ff22ad90de50bec6c9dcb461a. --- scripts/system/spectatorCamera.js | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/scripts/system/spectatorCamera.js b/scripts/system/spectatorCamera.js index 6b867d4abc..7b60c14575 100644 --- a/scripts/system/spectatorCamera.js +++ b/scripts/system/spectatorCamera.js @@ -48,7 +48,6 @@ var viewFinderOverlay = false; var camera = false; var cameraIsDynamic = false; - var attachedToggle = false; var lastCameraPosition = false; var lastCameraRotation = false; function updateRenderFromCamera() { @@ -124,30 +123,6 @@ dimensions: viewFinderOverlayDim }); setDisplay(monitorShowsCameraView); - - attachedToggle = Entities.addEntity({ - "color": { - "blue": 0, - "green": 0, - "red": 255 - }, - parentID: camera, - localPosition: { x: 0.1, y: 0, z: -0.05 }, - localRotation: { w: 0.70708787441253662, x: 0, y: 0, z: 0.70708787441253662 }, - "dimensions": { - "x": 0.03, - "y": 0.03, - "z": 0.03 - }, - "queryAACube": { - "scale": 0.052, - "x": -0.026, - "y": -0.026, - "z": -0.026 - }, - "shape": "Cylinder", - "type": "Shape" - }, true); } // Function Name: spectatorCameraOff() @@ -167,12 +142,8 @@ if (viewFinderOverlay) { Overlays.deleteOverlay(viewFinderOverlay); } - if (attachedToggle) { - Entities.deleteEntity(attachedToggle); - } camera = false; viewFinderOverlay = false; - attachedToggle = false; setDisplay(monitorShowsCameraView); } @@ -225,7 +196,6 @@ HMD.displayModeChanged.connect(onHMDChanged); viewFinderOverlay = false; camera = false; - attachedToggle = false; registerButtonMappings(); }