Skip to content
Snippets Groups Projects
Commit a6370bc9 authored by Greg Fodor's avatar Greg Fodor
Browse files

Hide hud in both cameras

parent b99a92d7
No related branches found
No related tags found
No related merge requests found
...@@ -125,7 +125,7 @@ AFRAME.registerComponent("camera-tool", { ...@@ -125,7 +125,7 @@ AFRAME.registerComponent("camera-tool", {
}, },
tock: (function() { tock: (function() {
const tempScale = new THREE.Vector3(); const tempHeadScale = new THREE.Vector3();
return function tock() { return function tock() {
const sceneEl = this.el.sceneEl; const sceneEl = this.el.sceneEl;
...@@ -138,11 +138,22 @@ AFRAME.registerComponent("camera-tool", { ...@@ -138,11 +138,22 @@ AFRAME.registerComponent("camera-tool", {
this.playerHead = headEl && headEl.object3D; this.playerHead = headEl && headEl.object3D;
} }
if (!this.playerHud) {
const hudEl = document.getElementById("player-hud");
this.playerHud = hudEl && hudEl.object3D;
}
if (this.takeSnapshotNextTick || this.updateRenderTargetNextTick) { if (this.takeSnapshotNextTick || this.updateRenderTargetNextTick) {
if (this.playerHead) { if (this.playerHead) {
tempScale.copy(this.playerHead.scale); tempHeadScale.copy(this.playerHead.scale);
this.playerHead.scale.set(1, 1, 1); this.playerHead.scale.set(1, 1, 1);
} }
if (this.playerHud) {
tempHeadScale.copy(this.playerHud.scale);
this.playerHud.scale.set(0.001, 0.001, 0.001);
}
const tmpVRFlag = renderer.vr.enabled; const tmpVRFlag = renderer.vr.enabled;
const tmpOnAfterRender = sceneEl.object3D.onAfterRender; const tmpOnAfterRender = sceneEl.object3D.onAfterRender;
delete sceneEl.object3D.onAfterRender; delete sceneEl.object3D.onAfterRender;
...@@ -160,7 +171,10 @@ AFRAME.registerComponent("camera-tool", { ...@@ -160,7 +171,10 @@ AFRAME.registerComponent("camera-tool", {
renderer.vr.enabled = tmpVRFlag; renderer.vr.enabled = tmpVRFlag;
sceneEl.object3D.onAfterRender = tmpOnAfterRender; sceneEl.object3D.onAfterRender = tmpOnAfterRender;
if (this.playerHead) { if (this.playerHead) {
this.playerHead.scale.copy(tempScale); this.playerHead.scale.copy(tempHeadScale);
}
if (this.playerHud) {
this.playerHud.scale.copy(tempHeadScale);
} }
this.lastUpdate = now; this.lastUpdate = now;
this.updateRenderTargetNextTick = false; this.updateRenderTargetNextTick = false;
......
...@@ -20,7 +20,8 @@ AFRAME.registerSystem("camera-mirror", { ...@@ -20,7 +20,8 @@ AFRAME.registerSystem("camera-mirror", {
this.mirrorCamera.rotation.set(0, Math.PI, 0); this.mirrorCamera.rotation.set(0, Math.PI, 0);
el.setObject3D("mirror-camera", this.mirrorCamera); el.setObject3D("mirror-camera", this.mirrorCamera);
const tempScale = new THREE.Vector3(); const tempHeadScale = new THREE.Vector3();
const tempHudScale = new THREE.Vector3();
const renderer = this.el.renderer; const renderer = this.el.renderer;
...@@ -29,28 +30,38 @@ AFRAME.registerSystem("camera-mirror", { ...@@ -29,28 +30,38 @@ AFRAME.registerSystem("camera-mirror", {
} }
const headEl = document.getElementById("player-head"); const headEl = document.getElementById("player-head");
const hudEl = document.getElementById("player-hud");
const playerHead = headEl && headEl.object3D; const playerHead = headEl && headEl.object3D;
const playerHud = hudEl && hudEl.object3D;
document.body.classList.add("mirrored-camera"); document.body.classList.add("mirrored-camera");
this.el.sceneEl.renderer.render = (scene, camera, renderTarget) => { this.el.sceneEl.renderer.render = (scene, camera, renderTarget) => {
const wasVREnabled = this.el.renderer.vr.enabled; const wasVREnabled = renderer.vr.enabled;
if (wasVREnabled) { if (wasVREnabled) {
this.directRenderFunc.call(this.el.renderer, scene, camera, renderTarget); this.directRenderFunc.call(renderer, scene, camera, renderTarget);
} }
if (playerHead) { if (playerHead) {
tempScale.copy(playerHead.scale); tempHeadScale.copy(playerHead.scale);
playerHead.scale.set(1, 1, 1); playerHead.scale.set(1, 1, 1);
} }
this.el.renderer.vr.enabled = false;
if (playerHud) {
tempHudScale.copy(playerHud.scale);
playerHud.scale.set(0.001, 0.001, 0.001);
}
renderer.vr.enabled = false;
const tmpOnAfterRender = this.el.object3D.onAfterRender; const tmpOnAfterRender = this.el.object3D.onAfterRender;
delete this.el.object3D.onAfterRender; delete this.el.object3D.onAfterRender;
this.directRenderFunc.call(this.el.renderer, scene, this.mirrorCamera); this.directRenderFunc.call(renderer, scene, this.mirrorCamera);
this.el.object3D.onAfterRender = tmpOnAfterRender; this.el.object3D.onAfterRender = tmpOnAfterRender;
this.el.renderer.vr.enabled = wasVREnabled; renderer.vr.enabled = wasVREnabled;
if (playerHead) { if (playerHead) {
playerHead.scale.copy(tempScale); playerHead.scale.copy(tempHeadScale);
}
if (playerHud) {
playerHud.scale.copy(tempHudScale);
} }
}; };
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment