Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 09:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Messing around, howard please refer the commit before this one"

Browse source 
This reverts commit 1392297da9.
This commit is contained in:
Patrick Manalich 2017-06-28 12:10:16 -07:00
parent 1392297da9
commit 9bcaa6d256
1 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/system/spectatorCamera.js
View file

@ -48,7 +48,6 @@
var viewFinderOverlay = false; var viewFinderOverlay = false;
var camera = false; var camera = false;
var cameraIsDynamic = false; var cameraIsDynamic = false;
var attachedToggle = false;
var lastCameraPosition = false; var lastCameraPosition = false;
var lastCameraRotation = false; var lastCameraRotation = false;
function updateRenderFromCamera() { function updateRenderFromCamera() {
@ -124,30 +123,6 @@
dimensions: viewFinderOverlayDim dimensions: viewFinderOverlayDim
}); });
setDisplay(monitorShowsCameraView); 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() // Function Name: spectatorCameraOff()
@ -167,12 +142,8 @@
if (viewFinderOverlay) { if (viewFinderOverlay) {
Overlays.deleteOverlay(viewFinderOverlay); Overlays.deleteOverlay(viewFinderOverlay);
} }
if (attachedToggle) {
Entities.deleteEntity(attachedToggle);
}
camera = false; camera = false;
viewFinderOverlay = false; viewFinderOverlay = false;
attachedToggle = false;
setDisplay(monitorShowsCameraView); setDisplay(monitorShowsCameraView);
} }
@ -225,7 +196,6 @@
HMD.displayModeChanged.connect(onHMDChanged); HMD.displayModeChanged.connect(onHMDChanged);
viewFinderOverlay = false; viewFinderOverlay = false;
camera = false; camera = false;
attachedToggle = false;
registerButtonMappings(); registerButtonMappings();
} }