@vertexvis/viewer 0.23.6-canary.9 → 0.23.6-testing.0

package/dist/cjs/index-4ebe6acf.js

@@ -1786,7 +1786,144 @@ const loadModule = (cmpMeta, hostRef, hmrVersionId) => {
     if (module) {
         return module[exportName];
     }
-    /*!__STENCIL_STATIC_IMPORT_SWITCH__*/
+    
+    if (!hmrVersionId || !BUILD.hotModuleReplacement) {
+      const processMod = importedModule => {
+        cmpModules.set(bundleId, importedModule);
+        return importedModule[exportName];
+      }
+      switch(bundleId) {
+        
+        case 'vertex-scene-tree.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-table-cell.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-table-cell.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-table-column.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-table-column.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-table-header.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-table-header.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-table-resize-divider.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-table-resize-divider.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-toolbar-group.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-toolbar-group.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-annotation-callout.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-annotation-callout.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-box-query-tool.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-box-query-tool.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-default-toolbar.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-default-toolbar.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-hit-result-indicator.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-hit-result-indicator.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-markup.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-markup.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-markup-tool.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-markup-tool.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-measurement-details.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-measurement-details.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-measurement-distance.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-measurement-distance.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-measurement-precise.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-measurement-precise.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-pin-tool.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-pin-tool.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-transform-widget.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-transform-widget.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-view-cube.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-view-cube.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-walk-mode-tool.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-walk-mode-tool.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-scene-tree-notification-banner_4.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-scene-tree-notification-banner_4.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-button_3.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-button_3.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-dom-group.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-dom-group.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-pin-group.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-pin-group.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-teleport-tool.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-teleport-tool.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-dom-element_2.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-dom-element_2.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-markup-arrow_3.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-markup-arrow_3.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-measurement-line_2.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-measurement-line_2.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-pin-label_2.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-pin-label_2.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-spinner.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-spinner.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-layer.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-layer.cjs.entry.js')); }).then(processMod, consoleError);
+        case 'vertex-viewer-icon.cjs':
+          return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
+            /* webpackMode: "lazy" */
+            './vertex-viewer-icon.cjs.entry.js')); }).then(processMod, consoleError);
+      }
+    }
     return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(
     /* @vite-ignore */
     /* webpackInclude: /\.entry\.js$/ */

package/dist/cjs/vertex-viewer.cjs.entry.js

@@ -758,14 +758,72 @@ class InteractionApi {
    *  values zoom out.
    */
   async zoomCamera(delta) {
-    return this.transformCamera(({ camera, viewport }) => {
-      const vv = camera.viewVector;
-      const v = bundle_esm.vector3.normalize(vv);
-      const distance = bundle_esm.vector3.magnitude(vv);
-      const epsilon = (3 * distance * delta) / viewport.height;
-      const position = bundle_esm.vector3.add(camera.position, bundle_esm.vector3.scale(epsilon, v));
-      const newCamera = camera.update({ position });
-      return newCamera;
+    return this.transformCamera(({ camera, viewport, frame, boundingBox }) => {
+      if (viewport != null && frame != null) {
+        const isPerspective = camera === null || camera === void 0 ? void 0 : camera.toFrameCamera().isPerspective();
+        if (isPerspective) {
+          const vv = camera.viewVector;
+          // Calculate the unit-less scalar determining the amount to zoom. The delta parameter
+          // is scaled by the viewport height because if the viewport is larger, then the
+          // user should have to perform a bigger action to zoom the model the same amount.
+          // Note that delta and viewport.height both have units of pixels. Further, the
+          // 3 multiplier was chosen to match the desired zoom speed.
+          const distance = bundle_esm.vector3.magnitude(vv);
+          const relativeDeltaToViewportHeight = 3 * distance * (delta / viewport.height);
+          // Scale the current viewVector by the scalar calculated above to determine how to adjust the camera position
+          const v = bundle_esm.vector3.normalize(vv);
+          const positionChange = bundle_esm.vector3.scale(relativeDeltaToViewportHeight, v);
+          // Calculate the new camera position
+          const position = bundle_esm.vector3.add(camera.position, positionChange);
+          // Update the camera with the new position
+          const newCamera = camera.update({ position });
+          return newCamera;
+        }
+        else {
+          // Retrieve properties of the current camera
+          const orthographicCamera = camera;
+          const frameCam = camera.toFrameCamera();
+          const dir = frameCam.direction;
+          const ray = viewport.transformPointToRay(viewport.center, frame.image, frameCam);
+          // Calculate the unit-less scalar determining the amount to zoom. The delta parameter
+          // is scaled by the viewport height because if the viewport is larger, then the
+          // user should have to perform a bigger action to zoom the model the same amount.
+          // Note that delta and viewport.height both have units of pixels. Further, the
+          // 4 multiplier was chosen to match the desired zoom speed.
+          const relativeDeltaToViewportHeight = 4 * (delta / viewport.height);
+          // Calculate the fovHeight after performing the zoom. zoomedFovHeight has the
+          // same units of camera.fovHeight (the world units). The new fovHeight
+          // has a minimum value, which is a function of the size of the bounding box,
+          // which ensures the new fovHeight is a positive, non-zero number.
+          const minimumFovHeight = bundle_esm.vector3.magnitude(bundle_esm.boundingBox.diagonal(boundingBox)) * 1e-5;
+          const zoomedFovHeight = Math.max(minimumFovHeight, orthographicCamera.fovHeight * (1 - relativeDeltaToViewportHeight));
+          // Calculate the plane and point to zoom relative to
+          const planeToZoomRelativeTo = bundle_esm.plane.fromNormalAndCoplanarPoint(dir, frameCam.lookAt);
+          const pointToZoomRelativeTo = bundle_esm.ray.intersectPlane(ray, planeToZoomRelativeTo);
+          if (pointToZoomRelativeTo != null) {
+            // Project the current look at point onto the zoom plane
+            const projectedLookAt = bundle_esm.plane.projectPoint(planeToZoomRelativeTo, orthographicCamera.lookAt);
+            // Calculate the vector to determine how to adjust the camera's look at point.
+            // Ensure that the viewVector is scaled to the expected length in order to
+            // ensure other camera calculations are correct, for example, the occlusion
+            // calculations for pins.
+            const fovHeightRelativeChange = (orthographicCamera.fovHeight - zoomedFovHeight) /
+              orthographicCamera.fovHeight;
+            const lookAtChangeVector = bundle_esm.vector3.scale(fovHeightRelativeChange, bundle_esm.vector3.subtract(pointToZoomRelativeTo, projectedLookAt));
+            // Calculate the camera's new look at point
+            const updatedLookAt = bundle_esm.vector3.add(orthographicCamera.lookAt, lookAtChangeVector);
+            // Update the orthographic camera
+            // Note rotationPoint should match lookAt after a zoom interaction
+            const newCamera = camera.update({
+              lookAt: updatedLookAt,
+              rotationPoint: updatedLookAt,
+              fovHeight: zoomedFovHeight,
+            });
+            return newCamera;
+          }
+        }
+      }
+      return camera;
     });
   }
   /**
@@ -979,17 +1037,33 @@ class InteractionApiOrthographic extends InteractionApi {
       }
       if (this.orthographicZoomData != null) {
         const { hitPt, hitPlane } = this.orthographicZoomData;
-        // The 4 multiplier was chosen to match the desired zoom speed
-        const relativeDelta = 4 * (camera.fovHeight / viewport.height) * delta;
-        const fovHeight = Math.max(1, camera.fovHeight - relativeDelta);
+        // Calculate the unit-less scalar determining the amount to zoom. The delta parameter
+        // is scaled by the viewport height because if the viewport is larger, then the
+        // user should have to perform a bigger action to zoom the model the same amount.
+        // Note that delta and viewport.height both have units of pixels. Further, the
+        // 4 multiplier was chosen to match the desired zoom speed.
+        const relativeDeltaToViewportHeight = 4 * (delta / viewport.height);
+        // Calculate the fovHeight after performing the zoom. zoomedFovHeight has the
+        // same units of camera.fovHeight (the world units). The new fovHeight
+        // has a minimum value, which is a function of the size of the bounding box,
+        // which ensures the new fovHeight is a positive, non-zero number.
+        const minimumFovHeight = bundle_esm.vector3.magnitude(bundle_esm.boundingBox.diagonal(boundingBox)) * 1e-5;
+        const zoomedFovHeight = Math.max(minimumFovHeight, camera.fovHeight * (1 - relativeDeltaToViewportHeight));
+        // Calculate the vector to determine how to adjust the camera's look at point.
+        // Ensure that the viewVector is scaled to the expected length in order to
+        // ensure other camera calculations are correct, for example, the occlusion
+        // calculations for pins.
         const projectedLookAt = bundle_esm.plane.projectPoint(hitPlane, camera.lookAt);
-        const diff = bundle_esm.vector3.scale((camera.fovHeight - fovHeight) / camera.fovHeight, bundle_esm.vector3.subtract(hitPt, projectedLookAt));
-        // rotationPoint should match lookAt after a zoom interaction
-        const updatedLookAt = bundle_esm.vector3.add(camera.lookAt, diff);
+        const fovHeightRelativeChange = (camera.fovHeight - zoomedFovHeight) / camera.fovHeight;
+        const lookAtChangeVector = bundle_esm.vector3.scale(fovHeightRelativeChange, bundle_esm.vector3.subtract(hitPt, projectedLookAt));
+        // Calculate the camera's new look at point
+        const updatedLookAt = bundle_esm.vector3.add(camera.lookAt, lookAtChangeVector);
+        // Return the updated camera
+        // Note rotationPoint should match lookAt after a zoom interaction
         return camera.update({
           lookAt: updatedLookAt,
           rotationPoint: updatedLookAt,
-          fovHeight: Math.max(1, camera.fovHeight - relativeDelta),
+          fovHeight: zoomedFovHeight,
         });
       }
       return camera;