@vertexvis/viewer 0.17.2-canary.0 → 0.17.2

package/dist/custom-elements/index.js

@@ -105381,6 +105381,193 @@ class Scene {
   }
 }
 
+const ALMOST_ONE = 0.9999;
+/**
+ * For any single vector, there are an infinite number of potential orthogonal vectors. This function will determine
+ * one orthogonal vector by crossing the provided vector with a unit vector in the positive X, Y, or Z directions.
+ * @param normal
+ * @returns
+ */
+function chooseOrthogonalVector(normal) {
+  const absNorm = vector3.create(Math.abs(normal.x), Math.abs(normal.y), Math.abs(normal.z));
+  const x = absNorm.x < absNorm.y && absNorm.x < absNorm.z ? 1.0 : 0.0;
+  const y = absNorm.y <= absNorm.x && absNorm.y < absNorm.z ? 1.0 : 0.0;
+  const z = absNorm.z <= absNorm.x && absNorm.z <= absNorm.y ? 1.0 : 0.0;
+  const vector = vector3.create(x, y, z);
+  return vector3.normalize(vector3.cross(normal, vector));
+}
+/**
+ * Computes the rotation matrix for two normals. If both normals are neither parallel or anti-parallel,
+ * this will compute the rotation matrix delta based on the angle from both normals.
+ * If the normals are anti-parallel, the identity matrix will be returned, as no rotation is necessary in this case.
+ * If the normals are parallel, an axis direction based on a chosen orthogonal vector will be used
+ * to compute the rotation matrix to rotate the plane 180 degrees.
+ * @param normal1
+ * @param normal2
+ * @returns an anti-parallel rotation Matrix4 betwen the given normals
+ */
+function computeRotationMatrix(normal1, normal2) {
+  const dot = vector3.dot(normal1, normal2);
+  // the angle is almost 0 in this case.
+  if (dot > ALMOST_ONE) {
+    const axisDirection = chooseOrthogonalVector(normal1);
+    const quaternion$1 = quaternion.fromAxisAngle(axisDirection, Math.PI);
+    return matrix4.makeRotation(quaternion$1);
+  }
+  // the angle is almost 180 in this case.
+  else if (dot <= -ALMOST_ONE) {
+    return matrix4.makeIdentity();
+  }
+  // the angle is between 0 & 180
+  else {
+    const angle = vector3.angleTo(normal2, normal1);
+    const axisDirection = vector3.normalize(vector3.cross(normal1, normal2));
+    return matrix4.makeRotation(quaternion.fromAxisAngle(axisDirection, angle + Math.PI));
+  }
+}
+/**
+ * Computes the translation & rotation matrix delta between two world positions and two normals.
+ * such that the computed translation matrix will be the delta between position 1 and position 2,
+ * and the rotation will be rotated to be anti-parallel.
+ *
+ * @param normal1
+ * @param position1
+ * @param normal2
+ * @param position2
+ *
+ * @returns Matrix4 translation matrix delta from position1 to
+ * position2 & an anti-parallel rotation delta.
+ */
+function computeTransformationDelta(normal1, position1, normal2, position2) {
+  const rotationMatrix = computeRotationMatrix(normal1, normal2);
+  const translationDeltaMatrix = matrix4.makeTranslation(position2);
+  return matrix4.multiply(matrix4.multiply(translationDeltaMatrix, rotationMatrix), matrix4.makeTranslation(vector3.negate(position1)));
+}
+
+const transformationDelta = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    ALMOST_ONE: ALMOST_ONE,
+    chooseOrthogonalVector: chooseOrthogonalVector,
+    computeRotationMatrix: computeRotationMatrix,
+    computeTransformationDelta: computeTransformationDelta
+});
+
+class TransformController {
+  constructor(stream) {
+    this.stream = stream;
+    this.isTransforming = false;
+    this.currentDelta = matrix4.makeIdentity();
+  }
+  async dispose() {
+    if (this.isTransforming) {
+      this.endTransform();
+    }
+  }
+  async beginTransform(delta = matrix4.makeIdentity()) {
+    if (!this.isTransforming) {
+      this.currentDelta = delta;
+      this.isTransforming = true;
+      console.debug('Beginning transform interaction');
+      await this.stream.beginInteraction({
+        transform: {
+          delta: this.toDeltaTransform(delta),
+        },
+      });
+    }
+  }
+  async updateTransform(delta) {
+    this.currentDelta = delta;
+    await this.stream.updateInteraction({
+      transform: {
+        delta: this.toDeltaTransform(this.currentDelta, true),
+      },
+    });
+  }
+  async updateTranslation(delta) {
+    this.currentDelta = matrix4.makeTranslation(delta);
+    await this.stream.updateInteraction({
+      transform: {
+        delta: this.toDeltaTransform(this.currentDelta),
+      },
+    });
+  }
+  getCurrentDelta() {
+    return this.currentDelta;
+  }
+  async endTransform() {
+    if (this.isTransforming) {
+      console.debug(`Ending transform interaction [delta=${this.currentDelta}]`);
+      await this.stream.endInteraction({
+        transform: {
+          delta: this.toDeltaTransform(this.currentDelta),
+        },
+      });
+      this.isTransforming = false;
+      this.currentDelta = matrix4.makeIdentity();
+    }
+  }
+  async endInteraction() {
+    if (this.isTransforming) {
+      await this.stream.endInteraction();
+      this.isTransforming = false;
+      this.currentDelta = matrix4.makeIdentity();
+    }
+  }
+  clearTransform() {
+    this.currentDelta = matrix4.makeIdentity();
+    this.endTransform();
+  }
+  toDeltaTransform(delta, columnMajor = false) {
+    const asObject = matrix4.toObject(delta);
+    // TODO: update this to pass a single order for the
+    // transform matrix after work in https://vertexvis.atlassian.net/browse/PLAT-1582
+    const basisX = columnMajor
+      ? {
+        x: asObject.m11,
+        y: asObject.m21,
+        z: asObject.m31,
+      }
+      : {
+        x: asObject.m11,
+        y: asObject.m12,
+        z: asObject.m13,
+      };
+    const basisY = columnMajor
+      ? {
+        x: asObject.m12,
+        y: asObject.m22,
+        z: asObject.m32,
+      }
+      : {
+        x: asObject.m21,
+        y: asObject.m22,
+        z: asObject.m23,
+      };
+    const basisZ = columnMajor
+      ? {
+        x: asObject.m13,
+        y: asObject.m23,
+        z: asObject.m33,
+      }
+      : {
+        x: asObject.m31,
+        y: asObject.m32,
+        z: asObject.m33,
+      };
+    return {
+      basisX,
+      basisY,
+      basisZ,
+      xlate: {
+        x: asObject.m14,
+        y: asObject.m24,
+        z: asObject.m34,
+      },
+      scale: asObject.m44,
+    };
+  }
+}
+
 class VolumeIntersectionQueryController {
   constructor(model, viewer) {
     this.model = model;
@@ -129221,122 +129408,6 @@ const ViewerToolbarGroup = class extends HTMLElement$1 {
   static get style() { return viewerToolbarGroupCss; }
 };
 
-class TransformController {
-  constructor(stream) {
-    this.stream = stream;
-    this.isTransforming = false;
-    this.currentDelta = matrix4.makeIdentity();
-  }
-  async dispose() {
-    if (this.isTransforming) {
-      this.endTransform();
-    }
-  }
-  async beginTransform(delta = matrix4.makeIdentity()) {
-    if (!this.isTransforming) {
-      this.currentDelta = delta;
-      this.isTransforming = true;
-      console.debug('Beginning transform interaction');
-      await this.stream.beginInteraction({
-        transform: {
-          delta: this.toDeltaTransform(delta),
-        },
-      });
-    }
-  }
-  async updateTransform(delta) {
-    this.currentDelta = delta;
-    await this.stream.updateInteraction({
-      transform: {
-        delta: this.toDeltaTransform(this.currentDelta, true),
-      },
-    });
-  }
-  async updateTranslation(delta) {
-    this.currentDelta = matrix4.makeTranslation(delta);
-    await this.stream.updateInteraction({
-      transform: {
-        delta: this.toDeltaTransform(this.currentDelta),
-      },
-    });
-  }
-  getCurrentDelta() {
-    return this.currentDelta;
-  }
-  async endTransform() {
-    if (this.isTransforming) {
-      console.debug(`Ending transform interaction [delta=${this.currentDelta}]`);
-      await this.stream.endInteraction({
-        transform: {
-          delta: this.toDeltaTransform(this.currentDelta),
-        },
-      });
-      this.isTransforming = false;
-      this.currentDelta = matrix4.makeIdentity();
-    }
-  }
-  async endInteraction() {
-    if (this.isTransforming) {
-      await this.stream.endInteraction();
-      this.isTransforming = false;
-      this.currentDelta = matrix4.makeIdentity();
-    }
-  }
-  clearTransform() {
-    this.currentDelta = matrix4.makeIdentity();
-    this.endTransform();
-  }
-  toDeltaTransform(delta, columnMajor = false) {
-    const asObject = matrix4.toObject(delta);
-    // TODO: update this to pass a single order for the
-    // transform matrix after work in https://vertexvis.atlassian.net/browse/PLAT-1582
-    const basisX = columnMajor
-      ? {
-        x: asObject.m11,
-        y: asObject.m21,
-        z: asObject.m31,
-      }
-      : {
-        x: asObject.m11,
-        y: asObject.m12,
-        z: asObject.m13,
-      };
-    const basisY = columnMajor
-      ? {
-        x: asObject.m12,
-        y: asObject.m22,
-        z: asObject.m32,
-      }
-      : {
-        x: asObject.m21,
-        y: asObject.m22,
-        z: asObject.m23,
-      };
-    const basisZ = columnMajor
-      ? {
-        x: asObject.m13,
-        y: asObject.m23,
-        z: asObject.m33,
-      }
-      : {
-        x: asObject.m31,
-        y: asObject.m32,
-        z: asObject.m33,
-      };
-    return {
-      basisX,
-      basisY,
-      basisZ,
-      xlate: {
-        x: asObject.m14,
-        y: asObject.m24,
-        z: asObject.m34,
-      },
-      scale: asObject.m44,
-    };
-  }
-}
-
 function convertPointToCanvas(point$1, bounds) {
   return bounds != null
     ? point.create(point$1.x - bounds.left, point$1.y - bounds.top)
@@ -129410,8 +129481,15 @@ function computeTranslation(current, previous, next, direction) {
   const rotatedDelta = vector3.multiply(rotatedTranslationAxis, vector3.subtract(next, previous));
   return rotatedDelta.x + rotatedDelta.y + rotatedDelta.z;
 }
-function computeRotation(rotationAxis, current) {
-  return matrix4.multiply(matrix4.multiply(matrix4.multiply(matrix4.makeTranslation(vector3.fromMatrixPosition(current)), matrix4.makeRotation(rotationAxis)), matrix4.makeTranslation(vector3.negate(vector3.fromMatrixPosition(current)))), current);
+/**
+ * Computes a rotation Matrix4 by applying the rotation at the given position,
+ * then translating it back to convert it to a world delta.
+ * @param rotation
+ * @param current
+ * @returns
+ */
+function computeRotation(rotation, current) {
+  return matrix4.multiply(matrix4.multiply(matrix4.multiply(matrix4.makeTranslation(vector3.fromMatrixPosition(current)), matrix4.makeRotation(rotation)), matrix4.makeTranslation(vector3.negate(vector3.fromMatrixPosition(current)))), current);
 }
 
 function xAxisRotationPositions(widgetTransform, camera, triangleSize = 3) {
@@ -129935,6 +130013,11 @@ const ViewerTransformWidget = class extends HTMLElement$1 {
         hovered: this.hoveredColor,
         disabledColor: this.disabledColor,
       });
+      if (this.rotation != null) {
+        this.currentTransform = this.getTransformForNewRotation(this.rotation);
+        this.startingTransform = this.currentTransform;
+        this.widget.updateTransform(this.currentTransform);
+      }
       if (this.position != null) {
         this.currentTransform = matrix4.makeTranslation(this.position);
         this.startingTransform = this.currentTransform;
@@ -129966,7 +130049,7 @@ const ViewerTransformWidget = class extends HTMLElement$1 {
         return matrix4.makeTranslation(newPosition);
       }
     };
-    this.getTransformForHewRotation = (newRotationEuler) => {
+    this.getTransformForNewRotation = (newRotationEuler) => {
       const c = this.currentTransform != null
         ? this.currentTransform
         : matrix4.makeIdentity();
@@ -130062,7 +130145,7 @@ const ViewerTransformWidget = class extends HTMLElement$1 {
    */
   handleRotationChanged(newRotation, oldRotation) {
     var _a;
-    this.currentTransform = this.getTransformForHewRotation(newRotation);
+    this.currentTransform = this.getTransformForNewRotation(newRotation);
     this.startingTransform = this.currentTransform;
     (_a = this.widget) === null || _a === void 0 ? void 0 : _a.updateTransform(this.currentTransform);
     console.debug(`Updating widget rotation [previous=${JSON.stringify(oldRotation)}, current=${JSON.stringify(newRotation)}]`);
@@ -130430,6 +130513,6 @@ const defineCustomElements = (opts) => {
   }
 };
 
-export { AngleUnits, AreaUnits, ArrowMarkup, CircleMarkup, colorMaterial as ColorMaterial, CursorManager, DistanceUnits, EntityType, FrameCameraBase, FreeformMarkup, loadableResource as LoadableResource, MeasurementController, MeasurementEntity, MeasurementModel, MeasurementOverlayManager, Frame as ReceivedFrame, FrameImage as ReceivedFrameImage, FrameScene as ReceivedFrameScene, FrameOrthographicCamera as ReceivedOrthographicCamera, FramePerspectiveCamera as ReceivedPerspectiveCamera, Scene, SceneTreeController, SynchronizedClock, VertexSceneTree, VertexSceneTreeSearch, VertexSceneTreeTableCell, VertexSceneTreeTableColumn, VertexSceneTreeTableHeader, VertexSceneTreeTableLayout, VertexSceneTreeTableResizeDivider, VertexSceneTreeToolbar, VertexSceneTreeToolbarGroup, VertexViewer, VertexViewerBoxQueryTool, VertexViewerButton, VertexViewerDefaultToolbar, VertexViewerDomElement, VertexViewerDomGroup, VertexViewerDomRenderer, VertexViewerHitResultIndicator, VertexViewerIcon, VertexViewerLayer, VertexViewerMarkup, VertexViewerMarkupArrow, VertexViewerMarkupCircle, VertexViewerMarkupFreeform, VertexViewerMarkupTool, VertexViewerMeasurementDetails, VertexViewerMeasurementDistance, VertexViewerMeasurementLine, VertexViewerMeasurementOverlays, VertexViewerMeasurementPrecise, VertexViewerPinGroup, VertexViewerPinLabel, VertexViewerPinLabelLine, VertexViewerPinTool, VertexViewerSpinner, VertexViewerToolbar, VertexViewerToolbarGroup, VertexViewerTransformWidget, VertexViewerViewCube, Viewport, VolumeIntersectionQueryController, __awaiter as _, __generator as a, __spreadArray as b, boxQueryCursor, createCommonjsModule as c, defineCustomElements, fromNodeProto, isLoadedRow, labelPinCursor, makeMinimumDistanceResult, measurementCursor, measurementWithArrowCursor, pinCursor };
+export { AngleUnits, AreaUnits, ArrowMarkup, CircleMarkup, colorMaterial as ColorMaterial, CursorManager, DistanceUnits, EntityType, FrameCameraBase, FreeformMarkup, loadableResource as LoadableResource, MeasurementController, MeasurementEntity, MeasurementModel, MeasurementOverlayManager, Frame as ReceivedFrame, FrameImage as ReceivedFrameImage, FrameScene as ReceivedFrameScene, FrameOrthographicCamera as ReceivedOrthographicCamera, FramePerspectiveCamera as ReceivedPerspectiveCamera, Scene, SceneTreeController, SynchronizedClock, TransformController, transformationDelta as TransformationDelta, VertexSceneTree, VertexSceneTreeSearch, VertexSceneTreeTableCell, VertexSceneTreeTableColumn, VertexSceneTreeTableHeader, VertexSceneTreeTableLayout, VertexSceneTreeTableResizeDivider, VertexSceneTreeToolbar, VertexSceneTreeToolbarGroup, VertexViewer, VertexViewerBoxQueryTool, VertexViewerButton, VertexViewerDefaultToolbar, VertexViewerDomElement, VertexViewerDomGroup, VertexViewerDomRenderer, VertexViewerHitResultIndicator, VertexViewerIcon, VertexViewerLayer, VertexViewerMarkup, VertexViewerMarkupArrow, VertexViewerMarkupCircle, VertexViewerMarkupFreeform, VertexViewerMarkupTool, VertexViewerMeasurementDetails, VertexViewerMeasurementDistance, VertexViewerMeasurementLine, VertexViewerMeasurementOverlays, VertexViewerMeasurementPrecise, VertexViewerPinGroup, VertexViewerPinLabel, VertexViewerPinLabelLine, VertexViewerPinTool, VertexViewerSpinner, VertexViewerToolbar, VertexViewerToolbarGroup, VertexViewerTransformWidget, VertexViewerViewCube, Viewport, VolumeIntersectionQueryController, __awaiter as _, __generator as a, __spreadArray as b, boxQueryCursor, createCommonjsModule as c, defineCustomElements, fromNodeProto, isLoadedRow, labelPinCursor, makeMinimumDistanceResult, measurementCursor, measurementWithArrowCursor, pinCursor };
 
 //# sourceMappingURL=index.js.map