@crystaldesign/real-time-viewer 24.13.0-beta.11 → 24.13.0-beta.13

package/build/esm/index.js

@@ -836,10 +836,10 @@ var GridStore = /*#__PURE__*/function () {
 var lightning = function lightning(diva3durl, scene, cams, isMobile, sceneStore) {
   var environmentTexture = CubeTexture.CreateFromPrefilteredData(diva3durl + 'environment.env', scene);
   environmentTexture.gammaSpace = false;
-  environmentTexture.rotationY = 1.25663706144;
+  environmentTexture.rotationY = 1.45;
   scene.environmentTexture = environmentTexture;
   scene.createDefaultSkybox(environmentTexture);
-  scene.environmentIntensity = 0.5;
+  scene.environmentIntensity = 1;
   scene.getMaterialByName('skyBox').alpha = 0;
   var ssao = new SSAO2RenderingPipeline('ssao', scene, {
     ssaoRatio: 0.5,
@@ -868,6 +868,7 @@ function createCams(scene, activeViewpoint, viewPoints) {
   var _useUtilStoreContext = useUtilStoreContext(),
     vector3ToBVector3 = _useUtilStoreContext.vector3ToBVector3,
     degreesToRadians = _useUtilStoreContext.degreesToRadians;
+  useUIStoreContext();
   function createCam(_ref) {
     var name = _ref.name,
       pos = _ref.pos,
@@ -1466,7 +1467,7 @@ var SceneStore = /*#__PURE__*/function () {
       var radius = Vector3.Distance(bbox.min, bbox.max) / 2;
       if (radius == Infinity) return;
       var aspectRatio = engine.getRenderHeight() / engine.getRenderWidth();
-      var distance = radius / Math.tan(cam.fov * 0.65);
+      var distance = radius / Math.tan(cam.fov * 0.55);
       var direction = cam.getDirection(Vector3.Backward());
       if (aspectRatio > 1) distance *= aspectRatio;
       var newPosition = center.add(direction.scale(distance));
@@ -1654,6 +1655,11 @@ var UIStore = /*#__PURE__*/function () {
     get: function get() {
       return !!this._isStaticBg;
     }
+  }, {
+    key: "unityCombActive",
+    get: function get() {
+      return !!this._overlayImage;
+    }
   }, {
     key: "initSelectionHandler",
     value: function initSelectionHandler(onElementSelected) {
@@ -3069,21 +3075,22 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 var parser = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var _changedElements$upda;
-    var sceneStore, hasRendered, hqRenderScript, scene, cache, changedElements, utilStore, wasPlanned, elementCount, _yield$findAssets, cacheGroup, newCache, _changedElements$upda2, focusedElement, focusedNode, _iterator, _step, node, bbox, boundingInfo, frustumPlanes, isInFrustum, sizeDiff;
+    var sceneStore, hasRendered, hqRenderScript, scene, cache, changedElements, utilStore, uiStore, wasPlanned, elementCount, _yield$findAssets, cacheGroup, newCache, _changedElements$upda2, focusedElement, focusedNode, _iterator, _step, node, bbox, boundingInfo, frustumPlanes, isInFrustum, sizeDiff;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           sceneStore = useSceneStoreContext();
           hasRendered = sceneStore.hasRendered, hqRenderScript = sceneStore.hqRenderScript, scene = sceneStore.scene, cache = sceneStore.cache, changedElements = sceneStore.changedElements;
           utilStore = useUtilStoreContext();
+          uiStore = useUIStoreContext();
           wasPlanned = sceneStore.hasPlanned;
           elementCount = sceneStore.elements.length; //disable elementrows from old cache
           changedElements === null || changedElements === void 0 || (_changedElements$upda = changedElements.updatedElements) === null || _changedElements$upda === void 0 || _changedElements$upda.forEach(function (el) {
             return utilStore.disableElementRows(el.name, cache);
           });
-          _context.next = 8;
+          _context.next = 9;
           return findAssets(hqRenderScript.assets, cache);
-        case 8:
+        case 9:
           _yield$findAssets = _context.sent;
           cacheGroup = _yield$findAssets.cacheGroup;
           newCache = _yield$findAssets.newCache;
@@ -3124,7 +3131,7 @@ var parser = /*#__PURE__*/function () {
           // Check if the bounding box is in the frustum
           focusedElement = sceneStore.focusedElement;
           if (!focusedElement) {
-            _context.next = 28;
+            _context.next = 29;
             break;
           }
           // let focusedNode = scene.getTransformNodeByName(focusedElement.name)!;
@@ -3145,24 +3152,24 @@ var parser = /*#__PURE__*/function () {
             _iterator.f();
           }
           if (focusedNode) {
-            _context.next = 22;
+            _context.next = 23;
             break;
           }
           return _context.abrupt("return");
-        case 22:
+        case 23:
           bbox = focusedNode.getHierarchyBoundingVectors();
           boundingInfo = new BoundingInfo(bbox.min, bbox.max);
           frustumPlanes = Frustum.GetPlanes(scene.activeCamera.getTransformationMatrix());
           isInFrustum = boundingInfo.isCompletelyInFrustum(frustumPlanes);
           sizeDiff = Vector3$1.Distance(bbox.min, bbox.max) - focusedElement.size;
-          if ((Math.abs(focusedNode.absolutePosition.x - focusedElement.position.x) > 0.05 || Math.abs(focusedNode.absolutePosition.y - focusedElement.position.y) > 0.05 || Math.abs(focusedNode.absolutePosition.z - focusedElement.position.z) > 0.05) && sceneStore.isControlledViewpoint) {
-            sceneStore.focusElement(focusedNode);
-          } else if (wasPlanned && sceneStore.isControlledViewpoint && (focusedElement.size != 0 && Math.abs(sizeDiff) > 0.09 || !isInFrustum && Math.abs(sizeDiff) > 0) || wasPlanned && elementCount != sceneStore.elements.length) {
+          if ((Math.abs(focusedNode.absolutePosition.x - focusedElement.position.x) > 0.05 || Math.abs(focusedNode.absolutePosition.y - focusedElement.position.y) > 0.05 || Math.abs(focusedNode.absolutePosition.z - focusedElement.position.z) > 0.05) && sceneStore.isControlledViewpoint || wasPlanned && sceneStore.isControlledViewpoint && (focusedElement.size != 0 && Math.abs(sizeDiff) > 0.09 || !isInFrustum && Math.abs(sizeDiff) > 0)) {
             sceneStore.focusElement(focusedNode);
+          } else if ((wasPlanned || !uiStore.unityCombActive) && elementCount != sceneStore.elements.length) {
+            sceneStore.focusElement();
           } else {
             updateCam(sceneStore.hqRenderScript.cams[0], sceneStore.scene);
           }
-        case 28:
+        case 29:
         case "end":
           return _context.stop();
       }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/createCams/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIvD,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,KAAK,EAAE,KAAK,EACZ,eAAe,CAAC,EAAE,SAAS,GAAG,gBAAgB,EAC9C,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,GAC5C,eAAe,EAAE,CAoGnB;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,QAU/D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/createCams/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAIvD,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,KAAK,EAAE,KAAK,EACZ,eAAe,CAAC,EAAE,SAAS,GAAG,gBAAgB,EAC9C,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,GAC5C,eAAe,EAAE,CAqGnB;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,QAU/D"}

package/build/types/real-time-viewer/src/store/UIStore.d.ts

@@ -25,6 +25,7 @@ export declare class UIStore {
         isStaticBg: boolean;
     });
     get isStaticBg(): boolean;
+    get unityCombActive(): boolean;
     private initSelectionHandler;
     createGridGui(mesh: Mesh, onClickDel?: any): void;
     removeGridGui(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"UIStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/UIStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,OAAO;IAClB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,IAAI,CAAyB;IACrC,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,uBAAuB,CAAC,CAAwC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,iBAAiB,CAAC,CAAmB;IAC7C,OAAO,CAAC,OAAO,CAA2H;IAC1I,OAAO,CAAC,QAAQ,CAAC,CAAoD;IACrE,OAAO,CAAC,WAAW,CAAC,CAAU;gBAG5B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,EACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,gBAAgB,KAAK,IAAI,EAC9D,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE;IA0BxD,IAAI,UAAU,YAEb;IAED,OAAO,CAAC,oBAAoB;IAgCrB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,GAAG;IAoC1C,aAAa;IAKb,OAAO,CAAC,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE;IAiC5E,UAAU,CAAC,IAAI,EAAE,MAAM;IAiBvB,eAAe,CACpB,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,YAAY,EAAE,OAAO,EACrB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,aAAa;IA8CvB,QAAQ;IAMR,MAAM;IAON,kBAAkB,iBAAkB;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,UAQ5F;IAEK,sBAAsB,CAAC,SAAS,EAAE,gBAAgB;CAW1D"}
+{"version":3,"file":"UIStore.d.ts","sourceRoot":"","sources":["../../../../../src/store/UIStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,qBAAa,OAAO;IAClB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,IAAI,CAAyB;IACrC,OAAO,CAAC,aAAa,CAAoB;IACzC,OAAO,CAAC,uBAAuB,CAAC,CAAwC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,iBAAiB,CAAC,CAAmB;IAC7C,OAAO,CAAC,OAAO,CAA2H;IAC1I,OAAO,CAAC,QAAQ,CAAC,CAAoD;IACrE,OAAO,CAAC,WAAW,CAAC,CAAU;gBAG5B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,EACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,CAAC,EAAE,QAAQ,EACnB,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,gBAAgB,KAAK,IAAI,EAC9D,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE;IA0BxD,IAAI,UAAU,YAEb;IAED,IAAI,eAAe,YAElB;IAED,OAAO,CAAC,oBAAoB;IAgCrB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,GAAG;IAoC1C,aAAa;IAKb,OAAO,CAAC,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE;IAiC5E,UAAU,CAAC,IAAI,EAAE,MAAM;IAiBvB,eAAe,CACpB,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,EACnB,YAAY,EAAE,OAAO,EACrB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,aAAa;IA8CvB,QAAQ;IAMR,MAAM;IAON,kBAAkB,iBAAkB;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,UAQ5F;IAEK,sBAAsB,CAAC,SAAS,EAAE,gBAAgB;CAW1D"}