Merge pull request #243 from matterport/mp_main

[three] - workaround path trailing slash assumption in three/LoaderUtil
NASA-AMMOS · Mar 20, 2022 · 25de40d · 25de40d
2 parents f3854d1 + 46ad812
commit 25de40d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/three/B3DMLoader.js b/src/three/B3DMLoader.js
@@ -41,7 +41,7 @@ export class B3DMLoader extends B3DMLoaderBase {
 
 			// GLTFLoader assumes the working path ends in a slash
 			let workingPath = this.workingPath;
-			if ( ! /[\\/]$/.test( workingPath ) ) {
+			if ( ! /[\\/]$/.test( workingPath ) && workingPath.length ) {
 
 				workingPath += '/';
 

diff --git a/src/three/GLTFExtensionLoader.js b/src/three/GLTFExtensionLoader.js
@@ -40,12 +40,16 @@ export class GLTFExtensionLoader extends LoaderBase {
 
 				}
 
-
 			}
 
 			// assume any pre-registered loader has paths configured as the user desires, but if we're making
 			// a new loader, use the working path during parse to support relative uris on other hosts
-			const resourcePath = loader.resourcePath || loader.path || this.workingPath;
+			let resourcePath = loader.resourcePath || loader.path || this.workingPath;
+			if ( ! /[\\/]$/.test( resourcePath ) && resourcePath.length ) {
+
+				resourcePath += '/';
+
+			}
 
 			loader.parse( buffer, resourcePath, model => {