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

package/package.json

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

package/src/api/classes/viewer.ts

@@ -701,29 +701,6 @@ The inspector can only be used in development builds.`);
       };
     }
 
-    // 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
-    scene.onNewTextureAddedObservable.add(async texture => {
-      // name is only available after the texture is "ready"
-      // since there is no "wait for texture ready" functionality we can use it on scene level
-      await scene.whenReadyAsync();
-
-      const cbnServerString = 'https://cbnpeuwstassets.blob.core.windows.net/public/';
-      const textureQueryString = '?name=';
-      const texture3dFolderString = 'Textures3d/';
-      const isFromCbnServer = texture.name.startsWith(cbnServerString);
-      const indexOfTextureQueryParam = texture.name.lastIndexOf(textureQueryString);
-
-      if (isFromCbnServer && indexOfTextureQueryParam > -1) {
-        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) {

package/src/api/manager/textureLoadManager.ts

@@ -80,6 +80,17 @@ export class TextureLoadManager extends EventBroadcaster {
     // More details: https://forum.babylonjs.com/t/basetexture-whenallready-returns-too-early/34501/4
     await sleep(0);
 
+    // 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
+    // => see CB-9558
+    const isUrl = texture.name.startsWith('https://');
+    const textureQueryString = '?name=';
+    const indexOfTextureQueryParam = texture.name.lastIndexOf(textureQueryString);
+
+    if (isUrl && indexOfTextureQueryParam > -1) {
+      texture.name = texture.name.substring(indexOfTextureQueryParam + textureQueryString.length);
+    }
+
     // Some textures are already in "ready state" after the sleep -> We don't care for them anymore as well as for
     // textures which don't come with an `onLoadObservable` (i.e. not of class {@link Texture}) or do not have an URL to
     // load (i.e. RawTexture2DArray texture type for morph target data storage).