@combeenation/3d-viewer 12.4.1-beta3 → 12.4.1-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@combeenation/3d-viewer",
-  "version": "12.4.1-beta3",
+  "version": "12.4.1-beta4",
   "description": "Combeenation 3D Viewer",
   "homepage": "https://github.com/Combeenation/3d-viewer#readme",
   "bugs": {

package/src/api/classes/viewer.ts

@@ -700,14 +700,6 @@ The inspector can only be used in development builds.`);
         }
       };
     }
-    this._sceneManager = await SceneManager.create(scene);
-    this._animationManager = await AnimationManager.create(scene);
-    if (sceneJson.cloneMaterialsOnMutation !== undefined) {
-      this._cloneMaterialsOnMutation = sceneJson.cloneMaterialsOnMutation;
-    }
-    // register observers for tag manager
-    this.tagManager.registerNewObjectObservers(scene);
-    this.broadcastEvent(Event.SCENE_PROCESSING_END, scene);
 
     // textures based CBN image assets are hard to analyse in the inspector, since the asset url is set as name
     // with this functionality we try to find these CBN image assets and crop the name accordingly
@@ -717,15 +709,30 @@ The inspector can only be used in development builds.`);
       await scene.whenReadyAsync();
 
       const cbnServerString = 'https://cbnpeuwstassets.blob.core.windows.net/public/';
-      const textureQueryString = '?name=Textures3d/';
+      const textureQueryString = '?name=';
+      const texture3dFolderString = 'Textures3d/';
       const isFromCbnServer = texture.name.startsWith(cbnServerString);
       const indexOfTextureQueryParam = texture.name.lastIndexOf(textureQueryString);
 
       if (isFromCbnServer && indexOfTextureQueryParam > -1) {
-        texture.name = texture.name.substring(indexOfTextureQueryParam + textureQueryString.length);
+        let texturePath = texture.name.substring(indexOfTextureQueryParam + textureQueryString.length);
+        if (texturePath.startsWith(texture3dFolderString)) {
+          texturePath = texturePath.substring(texturePath.length - texture3dFolderString.length);
+        }
+
+        texture.name = `CBN asset: ${texturePath}`;
       }
     });
 
+    this._sceneManager = await SceneManager.create(scene);
+    this._animationManager = await AnimationManager.create(scene);
+    if (sceneJson.cloneMaterialsOnMutation !== undefined) {
+      this._cloneMaterialsOnMutation = sceneJson.cloneMaterialsOnMutation;
+    }
+    // register observers for tag manager
+    this.tagManager.registerNewObjectObservers(scene);
+    this.broadcastEvent(Event.SCENE_PROCESSING_END, scene);
+
     return scene;
   }