From d26c08918a68625309d7d0176477e6e3b3a000d2 Mon Sep 17 00:00:00 2001
From: johnshaughnessy <johnfshaughnessy@gmail.com>
Date: Wed, 8 Aug 2018 17:35:53 -0700
Subject: [PATCH] DO call resolveMedia in loadGLTF
---
src/components/gltf-model-plus.js | 8 ++++++--
src/components/media-loader.js | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/components/gltf-model-plus.js b/src/components/gltf-model-plus.js
index bc0457d65..4ca78bb33 100644
--- a/src/components/gltf-model-plus.js
+++ b/src/components/gltf-model-plus.js
@@ -221,9 +221,13 @@ async function resolveGLTFUri(gltfProperty, basePath) {
}
async function loadGLTF(src, token, contentType, preferredTechnique, onProgress) {
- const basePath = THREE.LoaderUtils.extractUrlBase(src);
+ const resolved = await resolveMedia(src, token);
+ const raw = resolved.raw;
+ const origin = resolved.origin;
+ contentType = contentType || resolved.contentType;
+ const basePath = THREE.LoaderUtils.extractUrlBase(origin);
- let gltfUrl = src;
+ let gltfUrl = raw;
let fileMap;
if (contentType.includes("model/gltf+zip") || contentType.includes("application/x-zip-compressed")) {
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
index 81303a07d..abe00eb02 100644
--- a/src/components/media-loader.js
+++ b/src/components/media-loader.js
@@ -65,7 +65,7 @@ AFRAME.registerComponent("media-loader", {
if (!url) return;
- const { raw, origin, contentType } = await resolveMedia(url, token);
+ const { raw, contentType } = await resolveMedia(url, token);
if (token) {
if (this.blobURL) {
@@ -106,7 +106,7 @@ AFRAME.registerComponent("media-loader", {
{ once: true }
);
this.el.addEventListener("model-error", this.onError, { once: true });
- const src = this.blobURL || origin || url;
+ const src = this.blobURL || url;
this.el.setAttribute("gltf-model-plus", {
src,
contentType,
--
GitLab