Merge pull request #8338 from bghgary/gltf-log-fix

Fix inconsistent log messages in glTF loader

loaders/src/glTF/2.0/Extensions/EXT_lights_image_based.ts

@@ -79,7 +79,7 @@ export class EXT_lights_image_based implements IGLTFLoaderExtension {
             this._loader.logOpen(`${extensionContext}`);
 
             const light = ArrayItem.Get(`${extensionContext}/light`, this._lights, extension.light);
-            promises.push(this._loadLightAsync(`#/extensions/${this.name}/lights/${extension.light}`, light).then((texture) => {
+            promises.push(this._loadLightAsync(`/extensions/${this.name}/lights/${extension.light}`, light).then((texture) => {
                 this._loader.babylonScene.environmentTexture = texture;
             }));
 
@@ -105,7 +105,7 @@ export class EXT_lights_image_based implements IGLTFLoaderExtension {
 
                     const index = faces[face];
                     const image = ArrayItem.Get(specularImageContext, this._loader.gltf.images, index);
-                    promises.push(this._loader.loadImageAsync(`#/images/${index}`, image).then((data) => {
+                    promises.push(this._loader.loadImageAsync(`/images/${index}`, image).then((data) => {
                         imageData[mipmap][face] = data;
                     }));
 

loaders/src/glTF/2.0/Extensions/EXT_mesh_gpu_instancing.ts

@@ -48,7 +48,7 @@ export class EXT_mesh_gpu_instancing implements IGLTFLoaderExtension {
         return GLTFLoader.LoadExtensionAsync<IEXTMeshGpuInstancing, TransformNode>(context, node, this.name, (extensionContext, extension) => {
             this._loader._disableInstancedMesh++;
 
-            const promise = this._loader.loadNodeAsync(`#/nodes/${node.index}`, node, assign);
+            const promise = this._loader.loadNodeAsync(`/nodes/${node.index}`, node, assign);
 
             this._loader._disableInstancedMesh--;
 

loaders/src/glTF/2.0/Extensions/KHR_draco_mesh_compression.ts

@@ -94,7 +94,7 @@ export class KHR_draco_mesh_compression implements IGLTFLoaderExtension {
 
             var bufferView = ArrayItem.Get(extensionContext, this._loader.gltf.bufferViews, extension.bufferView) as IBufferViewDraco;
             if (!bufferView._dracoBabylonGeometry) {
-                bufferView._dracoBabylonGeometry = this._loader.loadBufferViewAsync(`#/bufferViews/${bufferView.index}`, bufferView).then((data) => {
+                bufferView._dracoBabylonGeometry = this._loader.loadBufferViewAsync(`/bufferViews/${bufferView.index}`, bufferView).then((data) => {
                     const dracoCompression = this.dracoCompression || DracoCompression.Default;
                     return dracoCompression.decodeMeshAsync(data, attributes).then((babylonVertexData) => {
                         const babylonGeometry = new Geometry(babylonMesh.name, this._loader.babylonScene);

loaders/src/glTF/2.0/Extensions/KHR_materials_variants.ts

@@ -128,13 +128,13 @@ export class KHR_materials_variants implements IGLTFLoaderExtension {
                 extension.mapping.forEach((mapping: IKHRMaterialVariantsMapping) => {
                     mapping.tags.forEach((tag: string, index: number) => {
                         const tagMapping = this._tagsToMap[tag] || [];
-                        const material = ArrayItem.Get(`#/materials/`, this._loader.gltf.materials, mapping.material);
+                        const material = ArrayItem.Get(`/materials/`, this._loader.gltf.materials, mapping.material);
                         const meshEntry: VariantMapping = {
                             mesh: babylonMesh,
                             materialPromise: Promise.resolve(null)
                         };
                         if (babylonMesh instanceof Mesh) {
-                            meshEntry.materialPromise = this._loader._loadMaterialAsync(`#/materials/${mapping.material}`, material, babylonMesh!, babylonDrawMode, (material) => {
+                            meshEntry.materialPromise = this._loader._loadMaterialAsync(`/materials/${mapping.material}`, material, babylonMesh!, babylonDrawMode, (material) => {
                                 meshEntry.material = material;
                             });
                         }

loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts

@@ -215,7 +215,7 @@ export class MSFT_audio_emitter implements IGLTFLoaderExtension {
         }
         else {
             const bufferView = ArrayItem.Get(`${context}/bufferView`, this._loader.gltf.bufferViews, clip.bufferView);
-            promise = this._loader.loadBufferViewAsync(`#/bufferViews/${bufferView.index}`, bufferView);
+            promise = this._loader.loadBufferViewAsync(`/bufferViews/${bufferView.index}`, bufferView);
         }
 
         clip._objectURL = promise.then((data) => {
@@ -237,7 +237,7 @@ export class MSFT_audio_emitter implements IGLTFLoaderExtension {
             };
 
             for (let i = 0; i < emitter.clips.length; i++) {
-                const clipContext = `#/extensions/${this.name}/clips`;
+                const clipContext = `/extensions/${this.name}/clips`;
                 const clip = ArrayItem.Get(clipContext, this._clips, emitter.clips[i].clip);
                 clipPromises.push(this._loadClipAsync(`${clipContext}/${emitter.clips[i].clip}`, clip).then((objectURL: string) => {
                     const sound = emitter._babylonSounds[i] = new Sound(name, objectURL, this._loader.babylonScene, null, options);
@@ -296,7 +296,7 @@ export class MSFT_audio_emitter implements IGLTFLoaderExtension {
         }
         const babylonAnimation = babylonAnimationGroup.targetedAnimations[0];
         const emitterIndex = event.emitter;
-        const emitter = ArrayItem.Get(`#/extensions/${this.name}/emitters`, this._emitters, emitterIndex);
+        const emitter = ArrayItem.Get(`/extensions/${this.name}/emitters`, this._emitters, emitterIndex);
         return this._loadEmitterAsync(context, emitter).then(() => {
             const sound = emitter._babylonData!.sound;
             if (sound) {

loaders/src/glTF/2.0/Extensions/MSFT_lod.ts

@@ -167,7 +167,7 @@ export class MSFT_lod implements IGLTFLoaderExtension {
                 }
 
                 const assign = (babylonTransformNode: TransformNode) => { babylonTransformNode.setEnabled(false); };
-                const promise = this._loader.loadNodeAsync(`#/nodes/${nodeLOD.index}`, nodeLOD, assign).then((babylonMesh) => {
+                const promise = this._loader.loadNodeAsync(`/nodes/${nodeLOD.index}`, nodeLOD, assign).then((babylonMesh) => {
                     if (indexLOD !== 0) {
                         // TODO: should not rely on _babylonTransformNode
                         const previousNodeLOD = nodeLODs[indexLOD - 1];
@@ -217,7 +217,7 @@ export class MSFT_lod implements IGLTFLoaderExtension {
                     this._materialIndexLOD = indexLOD;
                 }
 
-                const promise = this._loader._loadMaterialAsync(`#/materials/${materialLOD.index}`, materialLOD, babylonMesh, babylonDrawMode, (babylonMaterial) => {
+                const promise = this._loader._loadMaterialAsync(`/materials/${materialLOD.index}`, materialLOD, babylonMesh, babylonDrawMode, (babylonMaterial) => {
                     if (indexLOD === 0) {
                         assign(babylonMaterial);
                     }