@rings-webgpu/core 1.0.16 → 1.0.18

package/dist/rings.umd.max.js

@@ -35507,8 +35507,8 @@ else if (typeof exports === 'object')
                   baseColorFactor[3]
                 )
               );
-              physicMaterial.setUniformFloat("roughness", roughnessFactor);
-              physicMaterial.setUniformFloat("metallic", metallicFactor);
+              physicMaterial.setUniformFloat("roughness", roughnessFactor ?? 1);
+              physicMaterial.setUniformFloat("metallic", metallicFactor ?? 0);
               physicMaterial.setUniformFloat("ao", 1);
               physicMaterial.doubleSide = doubleSided;
               if (baseColorTexture) {
@@ -35519,6 +35519,11 @@ else if (typeof exports === 'object')
               }
               if (metallicRoughnessTexture) {
                 physicMaterial.setTexture("maskMap", metallicRoughnessTexture);
+                physicMaterial.shader.setDefine("USE_ROUGHNESS_G", true);
+                physicMaterial.shader.setDefine("USE_METALLIC_B", true);
+              } else {
+                physicMaterial.shader.setDefine("USE_ROUGHNESS_G", false);
+                physicMaterial.shader.setDefine("USE_METALLIC_B", false);
               }
               if (emissiveTexture) {
                 physicMaterial.setTexture("emissiveMap", emissiveTexture);
@@ -35568,7 +35573,8 @@ else if (typeof exports === 'object')
             numComponents: 1
           };
         }
-        if (!attribArrays[`normal`]) {
+        let needsNormalComputation = !attribArrays[`normal`];
+        if (needsNormalComputation) {
           let normal = [];
           let count = attribArrays["position"].data.length / 3;
           for (let i2 = 0; i2 < count; i2++) {
@@ -35597,6 +35603,9 @@ else if (typeof exports === 'object')
               nodeInfo.skin
             );
             this.gltf.resources[meshName2] = geometry;
+            if (needsNormalComputation && attribArrays[`indices`]?.data && attribArrays[`indices`].data.length > 0) {
+              geometry.computeNormals();
+            }
             let skeletonNode = this.gltf.nodes[nodeInfo.skin.skeleton];
             if (skeletonNode.dnode && skeletonNode.dnode["nodeObj"]) {
               this.convertSkeletonAnim(node, nodeInfo.skin);
@@ -35613,6 +35622,9 @@ else if (typeof exports === 'object')
               primitive
             );
             this.gltf.resources[meshName2] = geometry;
+            if (needsNormalComputation && attribArrays[`indices`]?.data && attribArrays[`indices`].data.length > 0) {
+              geometry.computeNormals();
+            }
             if (geometry.hasAttribute(VertexAttributeName.joints0)) {
               geometry.vertexAttributeMap.delete(VertexAttributeName.joints0);
             }
@@ -38966,7 +38978,9 @@ else if (typeof exports === 'object')
     static format = ParserFormat.BIN;
     async parseBuffer(buffer) {
       let loader = new B3DMLoader();
-      loader.adjustmentTransform = this.userData;
+      if (this.userData) {
+        loader.adjustmentTransform = this.userData;
+      }
       this.data = await loader.parse(buffer);
     }
     verification() {
@@ -41050,7 +41064,7 @@ else if (typeof exports === 'object')
     }
   }
 
-  const version = "1.0.16";
+  const version = "1.0.18";
 
   class Engine3D {
     /**
@@ -62053,15 +62067,25 @@ fn frag(){
         }
       }
       if (!parentTile) {
-        transform.rawData[12] -= boundCenter.x;
-        transform.rawData[13] -= boundCenter.y;
-        transform.rawData[14] -= boundCenter.z;
-      }
-      const worldTransform = transform.clone();
+        const tmpMat = new Matrix4();
+        tmpMat.copyFrom(transform);
+        tmpMat.rawData[12] = 0;
+        tmpMat.rawData[13] = 0;
+        tmpMat.rawData[14] = 0;
+        const position = new Vector3();
+        position.copyFrom(boundCenter);
+        position.applyMatrix4(tmpMat);
+        transform.rawData[12] = -position.x;
+        transform.rawData[13] = -position.y;
+        transform.rawData[14] = -position.z;
+      }
+      const worldTransform = new Matrix4();
+      worldTransform.copyFrom(transform);
       if (parentTile && parentTile.cached.worldTransform) {
         worldTransform.multiplyMatrices(parentTile.cached.worldTransform, transform);
       }
-      const transformInverse = worldTransform.clone();
+      const transformInverse = new Matrix4();
+      transformInverse.copyFrom(worldTransform);
       transformInverse.invert();
       tileObj.cached.transfrom = transform;
       tileObj.cached.worldTransform = worldTransform;
@@ -62169,16 +62193,14 @@ fn frag(){
       const adjustmentTransform = this._upRotationMatrix;
       switch (extension.toLowerCase()) {
         case "b3dm":
-          scene = await Engine3D.res.loadB3DM(
-            fullUrl,
-            {
-              onProgress: (e) => {
-              },
-              onComplete: (e) => {
-              }
+          const loader = new FileLoader();
+          const parser = await loader.load(fullUrl, B3DMParser, {
+            onProgress: (e) => {
             },
-            adjustmentTransform
-          );
+            onComplete: (e) => {
+            }
+          }, adjustmentTransform);
+          scene = parser.data;
           break;
         case "i3dm":
           scene = await Engine3D.res.loadI3DM(
@@ -62374,7 +62396,8 @@ fn frag(){
           break;
       }
       this._upRotationMatrix = adjustmentTransform;
-      const invertMatrix = adjustmentTransform.clone();
+      const invertMatrix = new Matrix4();
+      invertMatrix.copyFrom(adjustmentTransform);
       invertMatrix.invert();
       this._applyLocalTransform(this.group.transform, invertMatrix);
     }
@@ -62581,6 +62604,7 @@ fn frag(){
       this.frameCount = 0;
       this.isLoading = false;
       this.resetCacheStats();
+      this.group.destroy();
     }
     /**
      * Rings-specific: Add camera

package/package.json

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