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

Clean up monkey patching of render

parent f6d5541c
No related branches found
No related tags found
No related merge requests found
......@@ -130,7 +130,6 @@ AFRAME.registerComponent("camera-tool", {
return function tock() {
const sceneEl = this.el.sceneEl;
const cameraMirrorSystem = this.cameraMirrorSystem || sceneEl.systems["camera-mirror"];
const renderer = this.renderer || sceneEl.renderer;
const now = performance.now();
......@@ -160,14 +159,7 @@ AFRAME.registerComponent("camera-tool", {
delete sceneEl.object3D.onAfterRender;
renderer.vr.enabled = false;
// Use the direct, non mirrored render function if available
if (cameraMirrorSystem) {
cameraMirrorSystem
.getDirectRenderFunction()
.call(renderer, sceneEl.object3D, this.camera, this.renderTarget, true);
} else {
renderer.render(sceneEl.object3D, this.camera, this.renderTarget, true);
}
renderer.render(sceneEl.object3D, this.camera, this.renderTarget, true);
renderer.vr.enabled = tmpVRFlag;
sceneEl.object3D.onAfterRender = tmpOnAfterRender;
......
......@@ -20,26 +20,40 @@ AFRAME.registerSystem("camera-mirror", {
this.mirrorCamera.rotation.set(0, Math.PI, 0);
el.setObject3D("mirror-camera", this.mirrorCamera);
const tempHeadScale = new THREE.Vector3();
const tempHudScale = new THREE.Vector3();
const renderer = this.el.renderer;
document.body.classList.add("mirrored-camera");
if (!this.directRenderFunc) {
this.directRenderFunc = renderer.render;
this._patchRenderFunc();
}
},
unmirrorCameraAtEl(el) {
if (this.mirrorEl !== el) return;
el.removeObject3D("mirror-camera");
document.body.classList.remove("mirrored-camera");
this.mirrorEl = null;
this.mirrorCamera = null;
},
_patchRenderFunc() {
const headEl = document.getElementById("player-head");
const hudEl = document.getElementById("player-hud");
const tempHeadScale = new THREE.Vector3();
const tempHudScale = new THREE.Vector3();
const renderer = this.el.renderer;
const playerHead = headEl && headEl.object3D;
const playerHud = hudEl && hudEl.object3D;
document.body.classList.add("mirrored-camera");
this.directRenderFunc = renderer.render;
this.el.sceneEl.renderer.render = (scene, camera, renderTarget) => {
const wasVREnabled = renderer.vr.enabled;
if (wasVREnabled) {
if (wasVREnabled || renderTarget || !this.mirrorCamera) {
this.directRenderFunc.call(renderer, scene, camera, renderTarget);
if (!this.mirrorCamera || renderTarget) return;
}
if (playerHead) {
......@@ -64,27 +78,5 @@ AFRAME.registerSystem("camera-mirror", {
playerHud.scale.copy(tempHudScale);
}
};
},
unmirrorCameraAtEl(el) {
if (this.mirrorEl !== el) return;
if (this.directRenderFunc) {
this.el.renderer.render = this.directRenderFunc;
}
el.removeObject3D("mirror-camera");
document.body.classList.remove("mirrored-camera");
this.mirrorEl = null;
this.mirrorCamera = null;
},
getDirectRenderFunction() {
if (this.directRenderFunc) {
return this.directRenderFunc;
}
return this.el.renderer.render;
}
});
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