From c9205e89decc66ef2d9d6a8ae680d85cf2e4875e Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Tue, 17 Jul 2018 18:02:36 -0700
Subject: [PATCH] Wait a small delay before showing loader
---
src/components/media-loader.js | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
index 355b416ef..b2d5a7f2d 100644
--- a/src/components/media-loader.js
+++ b/src/components/media-loader.js
@@ -18,22 +18,27 @@ AFRAME.registerComponent("media-loader", {
const box = getBox(this.el, mesh);
const scaleCoefficient = getScaleCoefficient(0.5, box);
if (this.el.body && this.el.body.shapes.length > 1) {
- resize && this.el.object3D.scale.multiplyScalar(scaleCoefficient);
+ if (resize) {
+ this.el.object3D.scale.multiplyScalar(scaleCoefficient);
+ } else {
+ this.el.object3D.scale.set(1, 1, 1);
+ }
this.el.removeAttribute("shape");
} else {
const center = new THREE.Vector3();
const halfExtents = new THREE.Vector3();
getCenterAndHalfExtents(this.el, box, center, halfExtents);
mesh.position.sub(center);
- resize && this.el.object3D.scale.multiplyScalar(scaleCoefficient);
+ if (resize) {
+ this.el.object3D.scale.multiplyScalar(scaleCoefficient);
+ } else {
+ this.el.object3D.scale.set(1, 1, 1);
+ }
this.el.setAttribute("shape", {
shape: "box",
halfExtents: halfExtents
});
}
- if (!resize) {
- this.el.object3D.scale.set(1, 1, 1);
- }
},
onError() {
@@ -46,9 +51,12 @@ AFRAME.registerComponent("media-loader", {
try {
const url = this.data.src;
- // show loading mesh
- this.el.setObject3D("mesh", new THREE.Mesh(new THREE.BoxGeometry(), new THREE.MeshBasicMaterial()));
- this.setShapeAndScale(true);
+ this.showLoaderTimeout = setTimeout(() => {
+ console.log("showing loader");
+ const loadingObj = new THREE.Mesh(new THREE.BoxGeometry(), new THREE.MeshBasicMaterial());
+ this.el.setObject3D("mesh", loadingObj);
+ this.setShapeAndScale(true);
+ }, 100);
const { raw, origin, meta } = await resolveFarsparkUrl(url);
console.log("resolved", url, raw, origin, meta);
@@ -61,6 +69,7 @@ AFRAME.registerComponent("media-loader", {
"model-loaded",
() => {
console.log("clearing timeout");
+ clearTimeout(this.showLoaderTimeout);
this.setShapeAndScale(this.data.resize);
},
{ once: true }
--
GitLab