@rings-webgpu/core 1.0.22 → 1.0.24

package/dist/rings.es.max.js

@@ -37078,6 +37078,7 @@ class OBJParser extends ParserBase {
         }
       }
     }
+    const promiseList = [];
     for (const key in this.matLibs) {
       const mat2 = this.matLibs[key];
       if (mat2.textures && mat2.textures.length > 0) {
@@ -37085,10 +37086,16 @@ class OBJParser extends ParserBase {
           const texUrl = StringUtil.normalizePath(
             this.baseUrl + mat2.textures[i]
           );
-          await Engine3D.res.loadTexture(texUrl);
+          promiseList.push(Engine3D.res.loadTexture(texUrl).catch(
+            (error) => {
+              console.error(`Failed to load texture: ${texUrl}`, error);
+              return null;
+            }
+          ));
         }
       }
     }
+    await Promise.all(promiseList);
     sourceData = null;
     return true;
   }
@@ -40953,7 +40960,12 @@ class Res {
     }
     let texture = new BitmapTexture2D();
     texture.flipY = flipY;
-    await texture.load(url, loaderFunctions);
+    try {
+      await texture.load(url, loaderFunctions);
+    } catch (error) {
+      console.error(`Failed to load texture: ${url}`, error);
+      return null;
+    }
     this._texturePool.set(url, texture);
     return texture;
   }
@@ -41253,7 +41265,7 @@ class PostProcessingComponent extends ComponentBase {
   }
 }
 
-const version = "1.0.21";
+const version = "1.0.23";
 
 class Engine3D {
   /**
@@ -61582,6 +61594,9 @@ class BoundingVolume {
   _type;
   _data;
   _box;
+  get box() {
+    return this._box;
+  }
   _sphere;
   _matrix;
   constructor(data) {
@@ -62261,17 +62276,33 @@ class TilesRenderer {
       }
     }
     if (!parentTile) {
-      const tmpMat = new Matrix4();
-      tmpMat.copyFrom(transform);
-      tmpMat.rawData[12] = 0;
-      tmpMat.rawData[13] = 0;
-      tmpMat.rawData[14] = 0;
+      transform.copyFrom(this._upRotationMatrix);
       const position = new Vector3();
       position.copyFrom(boundCenter);
-      position.applyMatrix4(tmpMat);
+      position.applyMatrix4(transform);
+      const box = tileObj.cached.boundingVolume.box;
+      const boundCorners = [
+        new Vector3(box.min.x, box.min.y, box.min.z),
+        new Vector3(box.max.x, box.min.y, box.min.z),
+        new Vector3(box.min.x, box.max.y, box.min.z),
+        new Vector3(box.max.x, box.max.y, box.min.z),
+        new Vector3(box.min.x, box.min.y, box.max.z),
+        new Vector3(box.max.x, box.min.y, box.max.z),
+        new Vector3(box.min.x, box.max.y, box.max.z),
+        new Vector3(box.max.x, box.max.y, box.max.z)
+      ];
+      for (const corner of boundCorners) {
+        corner.applyMatrix4(transform);
+      }
+      const newBox = new BoundingBox();
+      boundCorners.forEach((corner) => {
+        newBox.expandByPoint(corner);
+      });
       transform.rawData[12] = -position.x;
       transform.rawData[13] = -position.y;
       transform.rawData[14] = -position.z;
+      const min = newBox.min;
+      transform.rawData[13] -= min.y;
     }
     const worldTransform = new Matrix4();
     worldTransform.copyFrom(transform);
@@ -62384,7 +62415,6 @@ class TilesRenderer {
     const extension = getUrlExtension(uri);
     const fullUrl = url;
     let scene = null;
-    const adjustmentTransform = this._upRotationMatrix;
     switch (extension.toLowerCase()) {
       case "b3dm":
         const loader = new FileLoader();
@@ -62393,7 +62423,7 @@ class TilesRenderer {
           },
           onComplete: (e) => {
           }
-        }, adjustmentTransform);
+        });
         scene = parser.data;
         break;
       case "i3dm":
@@ -62404,8 +62434,7 @@ class TilesRenderer {
             },
             onComplete: (e) => {
             }
-          },
-          adjustmentTransform
+          }
         );
         break;
       case "glb":
@@ -62579,10 +62608,10 @@ class TilesRenderer {
         adjustmentTransform.makeRotationAxis(Vector3.Y_AXIS, -Math.PI / 2);
         break;
       case "y":
-        adjustmentTransform.makeRotationAxis(Vector3.X_AXIS, Math.PI / 2);
+        adjustmentTransform.identity();
         break;
       case "z":
-        adjustmentTransform.identity();
+        adjustmentTransform.makeRotationAxis(Vector3.X_AXIS, -Math.PI / 2);
         break;
       default:
         console.warn(`Unknown gltfUpAxis: ${gltfUpAxis}, using default`);
@@ -62590,10 +62619,6 @@ class TilesRenderer {
         break;
     }
     this._upRotationMatrix = adjustmentTransform;
-    const invertMatrix = new Matrix4();
-    invertMatrix.copyFrom(adjustmentTransform);
-    invertMatrix.invert();
-    this._applyLocalTransform(this.group.transform, invertMatrix);
   }
   /**
    * Apply local transform matrix to Transform