@combeenation/3d-viewer 9.2.0 → 9.3.0

package/package.json

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

package/src/api/classes/variant.ts

@@ -689,6 +689,7 @@ export class Variant extends Parameterizable {
             this.viewer.scene.addCamera(camera);
           });
           this.assetContainer.materials.forEach(material => this.viewer.scene.materials.push(material));
+          this.assetContainer.skeletons.forEach(skeleton => this.viewer.scene.skeletons.push(skeleton));
           this.broadcastEvent(Event.ASSET_LOADING_END, this);
           resolve(this);
         },

package/src/api/manager/gltfExportManager.ts

@@ -165,6 +165,12 @@ export class GltfExportManager {
       this.setUniqueMeshNames(copiedScene);
       // get rid of negative scalings and morph targets, since iOS can't handle it in the QuickLook app
       bakeGeometryOfAllMeshes(copiedScene);
+      // certain devices can't load models with skeletons, just remove them since animations are not supported in the AR
+      // scene anyway
+      while (copiedScene.skeletons.length) {
+        const skeleton = copiedScene.skeletons.pop();
+        skeleton!.dispose();
+      }
     }
 
     return { scene: copiedScene, sceneCopied: true };

package/src/api/manager/textureLoadManager.ts

@@ -1,6 +1,6 @@
 import { Event } from '../classes/event';
 import { EventBroadcaster } from '../classes/eventBroadcaster';
-import { isTextureWithOnLoadObservable } from '../util/babylonHelper';
+import { isLoadableTexture } from '../util/babylonHelper';
 import { sleep } from '../util/resourceHelper';
 import { BaseTexture } from '@babylonjs/core/Materials/Textures/baseTexture';
 import { Scene as BabylonScene } from '@babylonjs/core/scene';
@@ -81,8 +81,9 @@ export class TextureLoadManager extends EventBroadcaster {
     await sleep(0);
 
     // 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}).
-    if (texture.isReady() || !isTextureWithOnLoadObservable(texture)) return;
+    // 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).
+    if (!isLoadableTexture(texture) || texture.isReady()) return;
 
     const noCurrentLoadingTextures = !this._loadingTextures.size;
     if (noCurrentLoadingTextures) {

package/src/api/util/babylonHelper.ts

@@ -763,19 +763,21 @@ const getClientRectFromMesh = function (mesh: AbstractMesh, scene: Scene, canvas
   } as ClientRect;
 };
 
-type BaseTextureWithOnLoadObservable = BaseTexture & {
+type LoadableBaseTexture = BaseTexture & {
+  url: string;
   onLoadObservable: Observable<BaseTexture>;
 };
 
 /**
- * This type guard checks whether the given `BaseTextures` is any of its subtypes which comes with an
+ * This type guard checks whether the given `BaseTextures` is any of its subtypes which comes with an url and
  * `onLoadObservable`.
  *
  * !!! Timing of when this function is called is important !!!
  * See the following for more details: https://forum.babylonjs.com/t/basetexture-whenallready-returns-too-early/34501/6
  */
-const isTextureWithOnLoadObservable = function (texture: BaseTexture): texture is BaseTextureWithOnLoadObservable {
-  return !!(texture as BaseTextureWithOnLoadObservable).onLoadObservable;
+const isLoadableTexture = function (texture: BaseTexture): texture is LoadableBaseTexture {
+  const castedTexture = texture as LoadableBaseTexture;
+  return !!castedTexture.url && !!castedTexture.onLoadObservable;
 };
 
 /**
@@ -874,7 +876,7 @@ const drawPaintableOnMaterial = function (
 
 export {
   getRootNode,
-  isTextureWithOnLoadObservable,
+  isLoadableTexture,
   mapToDottedNodes,
   getDottedPathForNode,
   cloneTransformNode,