@crystaldesign/real-time-viewer 26.4.0-beta.7 → 26.4.0-beta.8

package/build/esm/index.js

@@ -50,9 +50,9 @@ import { EngineFactory } from '@babylonjs/core/Engines/engineFactory';
 import { Scene } from '@babylonjs/core/scene';
 import { DracoCompression } from '@babylonjs/core/Meshes/Compression/dracoCompression';
 import { loadAssetContainerAsync } from '@babylonjs/core/Loading/index';
-import { PBRMetallicRoughnessMaterial as PBRMetallicRoughnessMaterial$1, Texture as Texture$1, WebGPUEngine } from '@babylonjs/core';
 import '@babylonjs/loaders/glTF/2.0/';
 import { UniversalCamera } from '@babylonjs/core/Cameras/universalCamera';
+import { WebGPUEngine } from '@babylonjs/core';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 (function() {
@@ -3277,7 +3277,7 @@ function _findAssets() {
         case 0:
           _importGeo = function _importGeo3() {
             _importGeo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(geo, path) {
-              var geoCached, cachedGeos, unusedGeos, geoCountToDelete, nextToDelete, size, result, mesh, _sceneStore$onMissing;
+              var geoCached, size, result, mesh, _sceneStore$onMissing;
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -3294,31 +3294,11 @@ function _findAssets() {
                     };
                     return _context2.abrupt("return", geoCached);
                   case 4:
-                    // cache max size otherwise some devices crash (ram to high)
-                    cachedGeos = cacheGroup.getChildren(undefined, true);
-                    if (cachedGeos.length > 10) {
-                      // find unused geos 
-                      unusedGeos = cachedGeos.filter(function (g) {
-                        return !cache.find(function (c) {
-                          var _c$geo;
-                          return ((_c$geo = c.geo) === null || _c$geo === void 0 ? void 0 : _c$geo.geometry.uniqueId) == g.uniqueId;
-                        });
-                      });
-                      geoCountToDelete = cachedGeos.length - 10;
-                      while (geoCountToDelete > 0 && unusedGeos.length > 0) {
-                        nextToDelete = unusedGeos.reduce(function (oIdx, cur, curIdx, ar) {
-                          return cur.metadata.lastUsed < ar[oIdx].metadata.lastUsed ? curIdx : oIdx;
-                        }, 0);
-                        unusedGeos[nextToDelete].dispose();
-                        unusedGeos.splice(nextToDelete, 1);
-                        geoCountToDelete--;
-                      }
-                    }
                     size = 0;
-                    _context2.prev = 7;
-                    _context2.next = 10;
+                    _context2.prev = 5;
+                    _context2.next = 8;
                     return loadAssetContainerAsync(path + geo.name + '.glb', sceneStore.scene);
-                  case 10:
+                  case 8:
                     result = _context2.sent;
                     utilStore.setAnalyzeDataRow({
                       name: geo.name,
@@ -3340,9 +3320,9 @@ function _findAssets() {
                       lastUsed: Date.now()
                     };
                     return _context2.abrupt("return", mesh);
-                  case 24:
-                    _context2.prev = 24;
-                    _context2.t0 = _context2["catch"](7);
+                  case 22:
+                    _context2.prev = 22;
+                    _context2.t0 = _context2["catch"](5);
                     (_sceneStore$onMissing = sceneStore.onMissingGeo) === null || _sceneStore$onMissing === void 0 || _sceneStore$onMissing.call(sceneStore);
                     utilStore.setAnalyzeDataRow({
                       name: geo.name,
@@ -3353,11 +3333,11 @@ function _findAssets() {
                       found: false
                     });
                     return _context2.abrupt("return", undefined);
-                  case 29:
+                  case 27:
                   case "end":
                     return _context2.stop();
                 }
-              }, _callee2, null, [[7, 24]]);
+              }, _callee2, null, [[5, 22]]);
             }));
             return _importGeo.apply(this, arguments);
           };
@@ -3817,8 +3797,6 @@ var buildScene = function buildScene(_ref) {
         }
       }
     }
-
-    // fill onElement for caching and other for applying in findmaterials
     function findMats(curMat, parentNode) {
       var cachedElement = cachedAssets.find(function (assets) {
         return assets.id == curMat.id;
@@ -3905,6 +3883,26 @@ var buildScene = function buildScene(_ref) {
     }
   }
   recursiveIteration(startNode, parentNode);
+  // cache max size otherwise some devices crash (ram to high)
+  var cachedGeos = cache.getChildren(undefined, true);
+  if (cachedGeos.length > 10) {
+    // find unused geos 
+    var unusedGeos = cachedGeos.filter(function (g) {
+      return !cachedAssets.find(function (c) {
+        var _c$geo;
+        return ((_c$geo = c.geo) === null || _c$geo === void 0 ? void 0 : _c$geo.geometry.uniqueId) == g.uniqueId;
+      });
+    });
+    var geoCountToDelete = cachedGeos.length - 10;
+    while (geoCountToDelete > 0 && unusedGeos.length > 0) {
+      var nextToDelete = unusedGeos.reduce(function (oIdx, cur, curIdx, ar) {
+        return cur.metadata.lastUsed < ar[oIdx].metadata.lastUsed ? curIdx : oIdx;
+      }, 0);
+      unusedGeos[nextToDelete].dispose();
+      unusedGeos.splice(nextToDelete, 1);
+      geoCountToDelete--;
+    }
+  }
   sceneStore.cache = cachedAssets;
 };
 
@@ -3914,34 +3912,55 @@ function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.lengt
 function findMaterials(cache) {
   var sceneStore = useSceneStoreContext();
   var matsOnMeshes = {};
+  var getDepth = function getDepth(child, ancestor) {
+    var depth = 0;
+    var current = child;
+    while (current && current.uniqueId !== ancestor.uniqueId) {
+      depth++;
+      current = current.parent;
+    }
+    return depth;
+  };
+
   //! parent = the parent from which on every child should receive the Material
   //! id = the id which points to the material that should be assigned
-  var setMaterials = function setMaterials(onNode, mat) {
-    var matStillExists = sceneStore.scene.materials.find(function (_mat) {
-      return mat.uniqueId == _mat.uniqueId;
-    });
-    if (!matStillExists) {
-      var sharedName = mat.name + '_recreated';
-      var sharedMat = sceneStore.scene.getMaterialByName(sharedName);
-      if (!sharedMat) {
-        sharedMat = new PBRMetallicRoughnessMaterial$1(sharedName, sceneStore.scene);
-        sharedMat.baseTexture = new Texture$1(mat.baseTexture.name, sceneStore.scene);
-        sharedMat.metallicRoughnessTexture = new Texture$1(mat.metallicRoughnessTexture.name, sceneStore.scene);
-        sharedMat.normalTexture = new Texture$1(mat.normalTexture.name, sceneStore.scene);
-      }
-      mat = sharedMat;
-    }
+  // the level defines how many parents above the material was set the lower the higher the prio
+  var setMaterials = function setMaterials(onNode, mat, parent) {
     if (onNode !== null && onNode !== void 0 && onNode._isMesh) {
-      matsOnMeshes[onNode.uniqueId] = {
-        mat: mat,
-        onNode: onNode
-      };
-      onNode.material = mat;
+      var matStillExists = sceneStore.scene.materials.find(function (_mat) {
+        return mat.uniqueId == _mat.uniqueId;
+      });
+      if (!matStillExists) {
+        var sharedName = mat.name + '_recreated';
+        var sharedMat = sceneStore.scene.getMaterialByName(sharedName);
+        if (!sharedMat) {
+          sharedMat = new PBRMetallicRoughnessMaterial(sharedName, sceneStore.scene);
+          sharedMat.baseTexture = new Texture(mat.baseTexture.name, sceneStore.scene);
+          sharedMat.metallicRoughnessTexture = new Texture(mat.metallicRoughnessTexture.name, sceneStore.scene);
+          sharedMat.normalTexture = new Texture(mat.normalTexture.name, sceneStore.scene);
+        }
+        mat = sharedMat;
+      }
+      var mesh = onNode;
+      if (mesh) {
+        var _mesh$metadata;
+        var depth = getDepth(mesh, parent);
+        if (mesh.material && ((_mesh$metadata = mesh.metadata) === null || _mesh$metadata === void 0 ? void 0 : _mesh$metadata["matLevel"]) < depth) return;
+        matsOnMeshes[onNode.uniqueId] = {
+          mat: mat,
+          onNode: onNode
+        };
+        mesh.material = mat;
+        if (!mesh.metadata) mesh.metadata = {
+          "matLevel": depth
+        };else mesh.metadata["matLevel"] = depth;
+      }
     }
     var _iterator = _createForOfIteratorHelper$1(onNode.getChildMeshes()),
       _step;
     try {
       var _loop = function _loop() {
+          var _mesh$metadata2;
           var mesh = _step.value;
           var existing = Object.keys(matsOnMeshes).find(function (key) {
             return key == mesh.uniqueId.toString();
@@ -3952,16 +3971,24 @@ function findMaterials(cache) {
               return node.uniqueId.toString() == existing;
             })) return 0; // continue
           }
+          var depth = getDepth(mesh, parent);
+          if (mesh.material && ((_mesh$metadata2 = mesh.metadata) === null || _mesh$metadata2 === void 0 ? void 0 : _mesh$metadata2["matLevel"]) < depth) return {
+            v: void 0
+          };
           matsOnMeshes[mesh.uniqueId] = {
             mat: mat,
             onNode: onNode
           };
           mesh.material = mat;
+          if (!mesh.metadata) mesh.metadata = {
+            "matLevel": depth
+          };else mesh.metadata["matLevel"] = depth;
         },
         _ret;
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         _ret = _loop();
         if (_ret === 0) continue;
+        if (_ret) return _ret.v;
       }
     } catch (err) {
       _iterator.e(err);
@@ -3974,14 +4001,18 @@ function findMaterials(cache) {
   var findOnNode = function findOnNode(mat, parent, onNode) {
     if (!mat.onNodes) return;
     var children = parent.getChildTransformNodes(false);
+    var childMeshes = parent.getChildMeshes(true);
+    if (onNode == "" || onNode == "ALL") childMeshes.forEach(function (cm) {
+      return setMaterials(cm, mat.mat, parent);
+    });
     var _iterator2 = _createForOfIteratorHelper$1(children),
       _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var child = _step2.value;
-        if (onNode == '' || onNode == 'ALL') setMaterials(child, mat.mat);
+        if (onNode == "" || onNode == "ALL") setMaterials(child, mat.mat, parent);
         if (child.name.startsWith(onNode) || child.name.startsWith('geo_') && child.name.includes(onNode)) {
-          setMaterials(child, mat.mat);
+          setMaterials(child, mat.mat, parent);
         }
       }
     } catch (err) {

package/build/types/real-time-viewer/src/parser/buildScene/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/buildScene/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAkB,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpD,QAAA,MAAM,UAAU,oDAKb;IACD,SAAS,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,YAAY,EAAE,KAAK,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,aAAa,CAAC;CAC5B,SAgHA,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/buildScene/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAkB,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpD,QAAA,MAAM,UAAU,oDAKb;IACD,SAAS,EAAE,QAAQ,CAAC;IACpB,KAAK,EAAE,aAAa,CAAC;IACrB,YAAY,EAAE,KAAK,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,aAAa,CAAC;CAC5B,SA+HA,CAAC;AAGF,eAAe,UAAU,CAAC"}

package/build/types/real-time-viewer/src/parser/findAssets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findAssets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAKpC,wBAA8B,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE;;;GAmK1E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findAssets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAW,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAKpC,wBAA8B,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE;;;GAoJ1E"}

package/build/types/real-time-viewer/src/parser/findMaterials/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findMaterials/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAY,MAAM,aAAa,CAAC;AAK9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,wBA2DnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findMaterials/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAY,MAAM,aAAa,CAAC;AAM9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,wBAwFnD"}