@rings-webgpu/core 1.0.22 → 1.0.24

package/dist/rings.umd.max.js

@@ -37085,6 +37085,7 @@ else if (typeof exports === 'object')
           }
         }
       }
+      const promiseList = [];
       for (const key in this.matLibs) {
         const mat2 = this.matLibs[key];
         if (mat2.textures && mat2.textures.length > 0) {
@@ -37092,10 +37093,16 @@ else if (typeof exports === 'object')
             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;
     }
@@ -40960,7 +40967,12 @@ else if (typeof exports === 'object')
       }
       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;
     }
@@ -41260,7 +41272,7 @@ else if (typeof exports === 'object')
     }
   }
 
-  const version = "1.0.21";
+  const version = "1.0.23";
 
   class Engine3D {
     /**
@@ -61589,6 +61601,9 @@ fn frag(){
     _type;
     _data;
     _box;
+    get box() {
+      return this._box;
+    }
     _sphere;
     _matrix;
     constructor(data) {
@@ -62268,17 +62283,33 @@ fn frag(){
         }
       }
       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);
@@ -62391,7 +62422,6 @@ fn frag(){
       const extension = getUrlExtension(uri);
       const fullUrl = url;
       let scene = null;
-      const adjustmentTransform = this._upRotationMatrix;
       switch (extension.toLowerCase()) {
         case "b3dm":
           const loader = new FileLoader();
@@ -62400,7 +62430,7 @@ fn frag(){
             },
             onComplete: (e) => {
             }
-          }, adjustmentTransform);
+          });
           scene = parser.data;
           break;
         case "i3dm":
@@ -62411,8 +62441,7 @@ fn frag(){
               },
               onComplete: (e) => {
               }
-            },
-            adjustmentTransform
+            }
           );
           break;
         case "glb":
@@ -62586,10 +62615,10 @@ fn frag(){
           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`);
@@ -62597,10 +62626,6 @@ fn frag(){
           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

package/dist/types/loader/parser/tileRenderer/core/BoundingVolume.d.ts

@@ -10,6 +10,7 @@ export declare class BoundingVolume {
     private _type;
     private _data;
     private _box?;
+    get box(): BoundingBox;
     private _sphere?;
     private _matrix?;
     constructor(data: BoundingVolumeData);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rings-webgpu/core",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "Rings webgpu Engine",
   "main": "index.js",
   "exports": {