From a6370bc92ab521bc3c047b303b7b86addeb4576a Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sat, 10 Nov 2018 01:41:45 +0000
Subject: [PATCH] Hide hud in both cameras
---
src/components/camera-tool.js | 20 +++++++++++++++++---
src/systems/camera-mirror.js | 27 +++++++++++++++++++--------
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/src/components/camera-tool.js b/src/components/camera-tool.js
index c9c73bf60..cff6bd835 100644
--- a/src/components/camera-tool.js
+++ b/src/components/camera-tool.js
@@ -125,7 +125,7 @@ AFRAME.registerComponent("camera-tool", {
},
tock: (function() {
- const tempScale = new THREE.Vector3();
+ const tempHeadScale = new THREE.Vector3();
return function tock() {
const sceneEl = this.el.sceneEl;
@@ -138,11 +138,22 @@ AFRAME.registerComponent("camera-tool", {
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.playerHead) {
- tempScale.copy(this.playerHead.scale);
+ tempHeadScale.copy(this.playerHead.scale);
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 tmpOnAfterRender = sceneEl.object3D.onAfterRender;
delete sceneEl.object3D.onAfterRender;
@@ -160,7 +171,10 @@ AFRAME.registerComponent("camera-tool", {
renderer.vr.enabled = tmpVRFlag;
sceneEl.object3D.onAfterRender = tmpOnAfterRender;
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.updateRenderTargetNextTick = false;
diff --git a/src/systems/camera-mirror.js b/src/systems/camera-mirror.js
index 780495746..b6c52117a 100644
--- a/src/systems/camera-mirror.js
+++ b/src/systems/camera-mirror.js
@@ -20,7 +20,8 @@ AFRAME.registerSystem("camera-mirror", {
this.mirrorCamera.rotation.set(0, Math.PI, 0);
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;
@@ -29,28 +30,38 @@ AFRAME.registerSystem("camera-mirror", {
}
const headEl = document.getElementById("player-head");
+ const hudEl = document.getElementById("player-hud");
const playerHead = headEl && headEl.object3D;
+ const playerHud = hudEl && hudEl.object3D;
document.body.classList.add("mirrored-camera");
this.el.sceneEl.renderer.render = (scene, camera, renderTarget) => {
- const wasVREnabled = this.el.renderer.vr.enabled;
+ const wasVREnabled = renderer.vr.enabled;
if (wasVREnabled) {
- this.directRenderFunc.call(this.el.renderer, scene, camera, renderTarget);
+ this.directRenderFunc.call(renderer, scene, camera, renderTarget);
}
if (playerHead) {
- tempScale.copy(playerHead.scale);
+ tempHeadScale.copy(playerHead.scale);
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;
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.renderer.vr.enabled = wasVREnabled;
+ renderer.vr.enabled = wasVREnabled;
if (playerHead) {
- playerHead.scale.copy(tempScale);
+ playerHead.scale.copy(tempHeadScale);
+ }
+ if (playerHud) {
+ playerHud.scale.copy(tempHudScale);
}
};
},
--
GitLab