From 56ab47547781473f21dd08cf101aa6635478ffe9 Mon Sep 17 00:00:00 2001 From: Daniel Adams Date: Mon, 28 Feb 2022 01:30:36 -0500 Subject: [PATCH 1/2] Remove additional OrbitControls ref, fix error Was getting an error while removing the hidden class from apainter-logo. Wrapped the code block in a DOMContentLoaded listener to fix. --- src/systems/painter.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/systems/painter.js b/src/systems/painter.js index dbd6d075..b5c0b383 100644 --- a/src/systems/painter.js +++ b/src/systems/painter.js @@ -76,13 +76,12 @@ AFRAME.registerSystem('painter', { if (urlParams.url || urlParams.urljson) { var isBinary = urlParams.urljson === undefined; this.brushSystem.loadFromUrl(urlParams.url || urlParams.urljson, isBinary); - document.getElementById('logo').setAttribute('visible', false); - document.getElementById('acamera').setAttribute('orbit-controls', 'initialPosition: 0 1.6 3'); - document.getElementById('apainter-logo').classList.remove('hidden'); - //document.getElementById('apainter-author').classList.remove('hidden'); // not used yet - } else { // No painting to load, move camera in front of logo - const cameraEl = document.getElementById('acamera') - cameraEl.setAttribute('position', '0 1.6 0'); + document.addEventListener('DOMContentLoaded', e => { + document.getElementById('logo').setAttribute('visible', false); + document.getElementById('acamera').setAttribute('position', '0 1.6 3'); + document.getElementById('apainter-logo').classList.remove('hidden'); + //document.getElementById('apainter-author').classList.remove('hidden'); // not used yet + }); } if (urlParams.bgcolor !== undefined) { From 99471c89ff0cb6e52453a006e8a1c4ceaf85d14e Mon Sep 17 00:00:00 2001 From: Daniel Adams Date: Mon, 28 Feb 2022 01:31:12 -0500 Subject: [PATCH 2/2] THREE.XHRLoader -> THREE.FileLoader --- src/systems/brush.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systems/brush.js b/src/systems/brush.js index a1373437..e2714841 100644 --- a/src/systems/brush.js +++ b/src/systems/brush.js @@ -507,7 +507,7 @@ AFRAME.registerSystem('brush', { console.timeEnd('Binary Loading'); }, loadFromUrl: function (url, binary) { - var loader = new THREE.XHRLoader(this.manager); + var loader = new THREE.FileLoader(this.manager); loader.crossOrigin = 'anonymous'; if (binary === true) { loader.setResponseType('arraybuffer');