@crystaldesign/real-time-viewer 26.2.0-rc.9 → 26.2.0

package/build/esm/index.js

@@ -3274,7 +3274,7 @@ function _findAssets() {
         case 0:
           _importGeo = function _importGeo3() {
             _importGeo = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(geo, path) {
-              var geoCached, size, result, mesh, _sceneStore$onMissing;
+              var geoCached, cachedGeos, unusedGeos, geoCountToDelete, nextToDelete, size, result, mesh, _sceneStore$onMissing;
               return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
@@ -3291,11 +3291,31 @@ 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 = 5;
-                    _context2.next = 8;
+                    _context2.prev = 7;
+                    _context2.next = 10;
                     return loadAssetContainerAsync(path + geo.name + '.glb', sceneStore.scene);
-                  case 8:
+                  case 10:
                     result = _context2.sent;
                     utilStore.setAnalyzeDataRow({
                       name: geo.name,
@@ -3317,9 +3337,9 @@ function _findAssets() {
                       lastUsed: Date.now()
                     };
                     return _context2.abrupt("return", mesh);
-                  case 22:
-                    _context2.prev = 22;
-                    _context2.t0 = _context2["catch"](5);
+                  case 24:
+                    _context2.prev = 24;
+                    _context2.t0 = _context2["catch"](7);
                     (_sceneStore$onMissing = sceneStore.onMissingGeo) === null || _sceneStore$onMissing === void 0 || _sceneStore$onMissing.call(sceneStore);
                     utilStore.setAnalyzeDataRow({
                       name: geo.name,
@@ -3330,11 +3350,11 @@ function _findAssets() {
                       found: false
                     });
                     return _context2.abrupt("return", undefined);
-                  case 27:
+                  case 29:
                   case "end":
                     return _context2.stop();
                 }
-              }, _callee2, null, [[5, 22]]);
+              }, _callee2, null, [[7, 24]]);
             }));
             return _importGeo.apply(this, arguments);
           };
@@ -3801,19 +3821,17 @@ var buildScene = function buildScene(_ref) {
         return assets.id == curMat.id;
       });
       if (!(cachedElement !== null && cachedElement !== void 0 && cachedElement.material)) return;
+      cachedElement.material.onElements.push(curElement);
       utilStore.setAnalyzeDataRowStatus(cachedElement.material.name, true);
       if (cachedElement.material.onNodes) {
-        if (!cachedElement.material.parents.find(function (p) {
-          return p.uniqueId == parentNode.uniqueId;
-        }) || !cachedElement.material.onNodes.includes(curMat.onNode) || !cachedElement.material.onElements.includes(curElement)) {
-          var _cachedElement$materi;
-          (_cachedElement$materi = cachedElement.material.parents) === null || _cachedElement$materi === void 0 || _cachedElement$materi.push(parentNode);
-          cachedElement.material.onElements.push(curElement);
-          cachedElement.material.onNodes.push(curMat.onNode);
-        }
+        cachedElement.material.onNodes.push(curMat.onNode);
       } else {
-        cachedElement.material.onElements.push(curElement);
         cachedElement.material.onNodes = [curMat.onNode];
+      }
+      if (cachedElement.material.parents) {
+        var _cachedElement$materi;
+        (_cachedElement$materi = cachedElement.material.parents) === null || _cachedElement$materi === void 0 || _cachedElement$materi.push(parentNode);
+      } else {
         cachedElement.material.parents = [parentNode];
       }
     }
@@ -3883,29 +3901,7 @@ var buildScene = function buildScene(_ref) {
       }
     }
   }
-
-  // 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--;
-    }
-  }
   recursiveIteration(startNode, parentNode);
-  console.log(" cache -> ", cachedAssets);
   sceneStore.cache = cachedAssets;
 };
 
@@ -3914,41 +3910,20 @@ function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r
 function _arrayLikeToArray$1(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function findMaterials(cache) {
   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
-  // the level defines how many parents above the material was set the lower the higher the prio
-  var setMaterials = function setMaterials(onNode, mat, parent) {
+  var setMaterials = function setMaterials(onNode, mat) {
     if (onNode !== null && onNode !== void 0 && onNode._isMesh) {
-      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;
-      }
+      matsOnMeshes[onNode.uniqueId] = {
+        mat: mat,
+        onNode: onNode
+      };
+      onNode.material = mat;
     }
     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();
@@ -3959,24 +3934,16 @@ 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);
@@ -3989,18 +3956,15 @@ 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, parent);
+        if (onNode == "" || onNode == "ALL") setMaterials(child, mat.mat);
         if (child.name.startsWith(onNode) || child.name.startsWith('geo_') && child.name.includes(onNode)) {
-          setMaterials(child, mat.mat, parent);
+          if (child.getChildren(undefined, true)) {}
+          setMaterials(child, mat.mat);
         }
       }
     } catch (err) {
@@ -4363,6 +4327,7 @@ function useRealTimeRenderData (_ref) {
   }
   function onFirstFrame() {
     var _callbacks$onInitiali2;
+    //sceneStore.scene?.debugLayer?.show();
     sceneStore.isInitializing = false;
     sceneStore.scene.onAfterRenderObservable.removeCallback(onFirstFrame);
     if (!overlayImage && !disableToggleLoading) actions.toggleLoading('buildScene', false, false);

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,SAmIA,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,SAgHA,CAAC;AAEF,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;;;GAoJ1E"}
+{"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"}

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;AAG9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,wBA0EnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/findMaterials/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAY,MAAM,aAAa,CAAC;AAG9C,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,wBA6CnD"}

package/build/types/real-time-viewer/src/useRealTimeRenderData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRealTimeRenderData.d.ts","sourceRoot":"","sources":["../../../../src/useRealTimeRenderData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAMhC,OAAO,8BAA8B,CAAC;AAWtC,MAAM,CAAC,OAAO,WAAW,EACvB,GAAG,EACH,SAAS,EACT,SAAS,EACT,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,SAAS,EACT,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,oBAAoB,GACrB,EAAE,KAAK;;;;EA2WP"}
+{"version":3,"file":"useRealTimeRenderData.d.ts","sourceRoot":"","sources":["../../../../src/useRealTimeRenderData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAMhC,OAAO,8BAA8B,CAAC;AAWtC,MAAM,CAAC,OAAO,WAAW,EACvB,GAAG,EACH,SAAS,EACT,SAAS,EACT,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,oBAAoB,EACpB,SAAS,EACT,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,oBAAoB,GACrB,EAAE,KAAK;;;;EA4WP"}