@crystaldesign/real-time-viewer 25.15.0-beta.1 → 25.15.0-beta.11

package/build/esm/index.js

@@ -3261,7 +3261,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:
@@ -3270,16 +3270,39 @@ function _findAssets() {
                       return g.name == geo.name;
                     });
                     if (!geoCached) {
-                      _context2.next = 3;
+                      _context2.next = 4;
                       break;
                     }
+                    geoCached.metadata = {
+                      lastUsed: Date.now()
+                    };
                     return _context2.abrupt("return", geoCached);
-                  case 3:
+                  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 = 4;
-                    _context2.next = 7;
+                    _context2.prev = 7;
+                    _context2.next = 10;
                     return loadAssetContainerAsync(path + geo.name + '.glb', sceneStore.scene);
-                  case 7:
+                  case 10:
                     result = _context2.sent;
                     utilStore.setAnalyzeDataRow({
                       name: geo.name,
@@ -3297,10 +3320,13 @@ function _findAssets() {
                     result.meshes[0].dispose();
                     mesh.name = geo.name;
                     mesh.parent = cacheGroup;
+                    mesh.metadata = {
+                      lastUsed: Date.now()
+                    };
                     return _context2.abrupt("return", mesh);
-                  case 20:
-                    _context2.prev = 20;
-                    _context2.t0 = _context2["catch"](4);
+                  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,
@@ -3311,11 +3337,11 @@ function _findAssets() {
                       found: false
                     });
                     return _context2.abrupt("return", undefined);
-                  case 25:
+                  case 29:
                   case "end":
                     return _context2.stop();
                 }
-              }, _callee2, null, [[4, 20]]);
+              }, _callee2, null, [[7, 24]]);
             }));
             return _importGeo.apply(this, arguments);
           };
@@ -3732,7 +3758,7 @@ var buildScene = function buildScene(_ref) {
           var geo = mesh.clone('geo_' + mesh.name, parentNode);
           geo.position = new Vector3(curGeo.pos.x / 100, curGeo.pos.y / 100, curGeo.pos.z / 100);
           geo.rotation = utilStore.degreesToRadians({
-            x: hqsGeo.isIDM3D ? 90 - curGeo.rot.x : -curGeo.rot.x,
+            x: hqsGeo.isIDM3D && curGeo.rot.x != 0 ? 90 - curGeo.rot.x : -curGeo.rot.x,
             y: 360 - curGeo.rot.y,
             z: 360 - curGeo.rot.z
           });
@@ -3871,16 +3897,41 @@ function _createForOfIteratorHelper$1(r, e) { var t = "undefined" != typeof Symb
 function _unsupportedIterableToArray$1(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$1(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$1(r, a) : void 0; } }
 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 = {};
   //! 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) {
-    if (onNode !== null && onNode !== void 0 && onNode._isMesh) onNode.material = mat;
+    if (onNode !== null && onNode !== void 0 && onNode._isMesh) {
+      matsOnMeshes[onNode.uniqueId] = {
+        mat: mat,
+        onNode: onNode
+      };
+      onNode.material = mat;
+    }
     var _iterator = _createForOfIteratorHelper$1(onNode.getChildMeshes()),
       _step;
     try {
+      var _loop = function _loop() {
+          var mesh = _step.value;
+          var existing = Object.keys(matsOnMeshes).find(function (key) {
+            return key == mesh.uniqueId.toString();
+          });
+          if (existing) {
+            if (onNode.uniqueId.toString() == existing) return 0; // continue
+            if (onNode.getChildren().find(function (node) {
+              return node.uniqueId.toString() == existing;
+            })) return 0; // continue
+          }
+          matsOnMeshes[mesh.uniqueId] = {
+            mat: mat,
+            onNode: onNode
+          };
+          mesh.material = mat;
+        },
+        _ret;
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var mesh = _step.value;
-        mesh.material = mat;
+        _ret = _loop();
+        if (_ret === 0) continue;
       }
     } catch (err) {
       _iterator.e(err);
@@ -3890,7 +3941,7 @@ function findMaterials(cache) {
   };
 
   //! find On Node from json to scene and then call setMaterials to apply it to all Children
-  var findOnNode = function findOnNode(mat, parent) {
+  var findOnNode = function findOnNode(mat, parent, onNode) {
     if (!mat.onNodes) return;
     var children = parent.getChildTransformNodes(false);
     var _iterator2 = _createForOfIteratorHelper$1(children),
@@ -3898,20 +3949,10 @@ function findMaterials(cache) {
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var child = _step2.value;
-        var _iterator3 = _createForOfIteratorHelper$1(mat.onNodes),
-          _step3;
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var onNode = _step3.value;
-            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);
-            }
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
+        if (onNode == "" || onNode == "ALL") setMaterials(child, mat.mat);
+        if (child.name.startsWith(onNode) || child.name.startsWith('geo_') && child.name.includes(onNode)) {
+          if (child.getChildren(undefined, true)) {}
+          setMaterials(child, mat.mat);
         }
       }
     } catch (err) {
@@ -3920,29 +3961,22 @@ function findMaterials(cache) {
       _iterator2.f();
     }
   };
-  var _iterator4 = _createForOfIteratorHelper$1(cache),
-    _step4;
+  var _iterator3 = _createForOfIteratorHelper$1(cache),
+    _step3;
   try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var element = _step4.value;
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var element = _step3.value;
       if (!element.material || !element.material.parents) continue;
-      var _iterator5 = _createForOfIteratorHelper$1(element.material.parents),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var parent = _step5.value;
-          findOnNode(element.material, parent);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
+      for (var idx = 0; idx < element.material.parents.length; idx++) {
+        var parent = element.material.parents[idx];
+        var onNode = element.material.onNodes[idx];
+        findOnNode(element.material, parent, onNode);
       }
     }
   } catch (err) {
-    _iterator4.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator4.f();
+    _iterator3.f();
   }
   return findMaterials;
 }

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;;;GAiJ1E"}
+{"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;;;GAoK1E"}

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,wBAgCnD"}
+{"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"}