From e994b7b202d68c48241ce308b291de499cb518a3 Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Mon, 26 Mar 2018 17:10:08 -0700
Subject: [PATCH] Cleanup based on PR feedback
---
src/components/player-info.js | 1 -
src/elements/a-gltf-entity.js | 22 +++++++++++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/components/player-info.js b/src/components/player-info.js
index 717b1d2a9..8cb265a67 100644
--- a/src/components/player-info.js
+++ b/src/components/player-info.js
@@ -17,7 +17,6 @@ AFRAME.registerComponent("player-info", {
},
applyProperties() {
const nametagEl = this.el.querySelector(".nametag");
- console.log("updating properties", this.data, nametagEl);
if (this.data.displayName && nametagEl) {
nametagEl.setAttribute("text", {
value: this.data.displayName
diff --git a/src/elements/a-gltf-entity.js b/src/elements/a-gltf-entity.js
index d8318246d..b6923b123 100644
--- a/src/elements/a-gltf-entity.js
+++ b/src/elements/a-gltf-entity.js
@@ -218,6 +218,8 @@ AFRAME.registerElement("a-gltf-entity", {
templateRoot: document.importNode(templateEl.content.firstElementChild, true)
})
);
+ // Imported custom nodes don't immediatly set up their callbacks in Firefox, wait a tick before considering them "loaded"
+ // We do this all up front so that we don't have to wait every time we load a new GLTF model.
setTimeout(resolve, 0);
});
}
@@ -246,7 +248,11 @@ AFRAME.registerElement("a-gltf-entity", {
if (src === this.lastSrc) return;
this.lastSrc = src;
- if (!src) return;
+ if (!src) {
+ console.warn("gltf-entity set to an empty source, unloading inflated model.");
+ this.removeInflatedEl();
+ return;
+ }
const model = await cachedLoadGLTF(src);
@@ -255,10 +261,7 @@ AFRAME.registerElement("a-gltf-entity", {
if (src != this.lastSrc) return;
// If we had inflated something already before, clean that up
- if (this.inflatedEl) {
- this.inflatedEl.parentNode.removeChild(this.inflatedEl);
- delete this.inflatedEl;
- }
+ this.removeInflatedEl();
this.model = model.scene || model.scenes[0];
this.model.animations = model.animations;
@@ -279,6 +282,15 @@ AFRAME.registerElement("a-gltf-entity", {
}
},
+ removeInflatedEl: {
+ value() {
+ if (this.inflatedEl) {
+ this.inflatedEl.parentNode.removeChild(this.inflatedEl);
+ delete this.inflatedEl;
+ }
+ }
+ },
+
attributeChangedCallback: {
value(attr, oldVal, newVal) {
if (attr === "src") {
--
GitLab