@vertexvis/viewer 0.17.1 → 0.17.2-canary.1

package/dist/cjs/controller-b93c925e.js

@@ -0,0 +1,126 @@
+/*!
+ * Copyright (c) 2023 Vertex Software LLC. All rights reserved.
+ */
+'use strict';
+
+const bundle_esm = require('./bundle.esm-5847ff0b.js');
+
+class TransformController {
+  constructor(stream) {
+    this.stream = stream;
+    this.isTransforming = false;
+    this.currentDelta = bundle_esm.matrix4.makeIdentity();
+  }
+  async dispose() {
+    if (this.isTransforming) {
+      this.endTransform();
+    }
+  }
+  async beginTransform(delta = bundle_esm.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 = bundle_esm.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 = bundle_esm.matrix4.makeIdentity();
+    }
+  }
+  async endInteraction() {
+    if (this.isTransforming) {
+      await this.stream.endInteraction();
+      this.isTransforming = false;
+      this.currentDelta = bundle_esm.matrix4.makeIdentity();
+    }
+  }
+  clearTransform() {
+    this.currentDelta = bundle_esm.matrix4.makeIdentity();
+    this.endTransform();
+  }
+  toDeltaTransform(delta, columnMajor = false) {
+    const asObject = bundle_esm.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,
+    };
+  }
+}
+
+exports.TransformController = TransformController;
+
+//# sourceMappingURL=controller-b93c925e.js.map

package/dist/cjs/controller-b93c925e.js.map

@@ -0,0 +1 @@
+{"file":"controller-b93c925e.js","mappings":"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","names":["Matrix4"],"sources":["./src/lib/transforms/controller.ts"],"sourcesContent":["import { vertexvis } from '@vertexvis/frame-streaming-protos';\nimport { Matrix4, Vector3 } from '@vertexvis/geometry';\nimport { StreamApi } from '@vertexvis/stream-api';\n\nexport class TransformController {\n  private isTransforming = false;\n  private currentDelta: Matrix4.Matrix4 = Matrix4.makeIdentity();\n\n  public constructor(private stream: StreamApi) {}\n\n  public async dispose(): Promise<void> {\n    if (this.isTransforming) {\n      this.endTransform();\n    }\n  }\n\n  public async beginTransform(\n    delta: Matrix4.Matrix4 = Matrix4.makeIdentity()\n  ): Promise<void> {\n    if (!this.isTransforming) {\n      this.currentDelta = delta;\n      this.isTransforming = true;\n\n      console.debug('Beginning transform interaction');\n\n      await this.stream.beginInteraction({\n        transform: {\n          delta: this.toDeltaTransform(delta),\n        },\n      });\n    }\n  }\n\n  public async updateTransform(delta: Matrix4.Matrix4): Promise<void> {\n    this.currentDelta = delta;\n\n    await this.stream.updateInteraction({\n      transform: {\n        delta: this.toDeltaTransform(this.currentDelta, true),\n      },\n    });\n  }\n\n  public async updateTranslation(delta: Vector3.Vector3): Promise<void> {\n    this.currentDelta = Matrix4.makeTranslation(delta);\n\n    await this.stream.updateInteraction({\n      transform: {\n        delta: this.toDeltaTransform(this.currentDelta),\n      },\n    });\n  }\n\n  public getCurrentDelta(): Matrix4.Matrix4 | undefined {\n    return this.currentDelta;\n  }\n\n  public async endTransform(): Promise<void> {\n    if (this.isTransforming) {\n      console.debug(\n        `Ending transform interaction [delta=${this.currentDelta}]`\n      );\n\n      await this.stream.endInteraction({\n        transform: {\n          delta: this.toDeltaTransform(this.currentDelta),\n        },\n      });\n      this.isTransforming = false;\n      this.currentDelta = Matrix4.makeIdentity();\n    }\n  }\n\n  public async endInteraction(): Promise<void> {\n    if (this.isTransforming) {\n      await this.stream.endInteraction();\n      this.isTransforming = false;\n      this.currentDelta = Matrix4.makeIdentity();\n    }\n  }\n\n  public clearTransform(): void {\n    this.currentDelta = Matrix4.makeIdentity();\n    this.endTransform();\n  }\n\n  private toDeltaTransform(\n    delta: Matrix4.Matrix4,\n    columnMajor = false\n  ): vertexvis.protobuf.core.IAffineMatrix4f {\n    const asObject = Matrix4.toObject(delta);\n\n    // TODO: update this to pass a single order for the\n    // transform matrix after work in https://vertexvis.atlassian.net/browse/PLAT-1582\n    const basisX = columnMajor\n      ? {\n          x: asObject.m11,\n          y: asObject.m21,\n          z: asObject.m31,\n        }\n      : {\n          x: asObject.m11,\n          y: asObject.m12,\n          z: asObject.m13,\n        };\n    const basisY = columnMajor\n      ? {\n          x: asObject.m12,\n          y: asObject.m22,\n          z: asObject.m32,\n        }\n      : {\n          x: asObject.m21,\n          y: asObject.m22,\n          z: asObject.m23,\n        };\n    const basisZ = columnMajor\n      ? {\n          x: asObject.m13,\n          y: asObject.m23,\n          z: asObject.m33,\n        }\n      : {\n          x: asObject.m31,\n          y: asObject.m32,\n          z: asObject.m33,\n        };\n\n    return {\n      basisX,\n      basisY,\n      basisZ,\n      xlate: {\n        x: asObject.m14,\n        y: asObject.m24,\n        z: asObject.m34,\n      },\n      scale: asObject.m44,\n    };\n  }\n}\n"],"version":3}

package/dist/cjs/index.cjs.js

@@ -17,16 +17,86 @@ const streamAttributes = require('./streamAttributes-fc4f97e1.js');
 const entities = require('./entities-a2e154e7.js');
 const markup = require('./markup-10958c12.js');
 const viewport = require('./viewport-1f918fe4.js');
-const controller$1 = require('./controller-1961ce2b.js');
+const bundle_esm = require('./bundle.esm-5847ff0b.js');
+const controller$1 = require('./controller-b93c925e.js');
+const controller$2 = require('./controller-1961ce2b.js');
 require('./browser.esm-bf5e4488.js');
-require('./bundle.esm-5847ff0b.js');
 require('./errors-3842d8ec.js');
 require('./bundle.esm-d51532e3.js');
 require('./wrappers_pb-9ec12cf5.js');
 require('./_commonjsHelpers-77dbcc2e.js');
 require('./mapper-fb3499f2.js');
 
+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 = bundle_esm.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 = bundle_esm.vector3.create(x, y, z);
+  return bundle_esm.vector3.normalize(bundle_esm.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 = bundle_esm.vector3.dot(normal1, normal2);
+  // the angle is almost 0 in this case.
+  if (dot > ALMOST_ONE) {
+    const axisDirection = chooseOrthogonalVector(normal1);
+    const quaternion = bundle_esm.quaternion.fromAxisAngle(axisDirection, Math.PI);
+    return bundle_esm.matrix4.makeRotation(quaternion);
+  }
+  // the angle is almost 180 in this case.
+  else if (dot <= -ALMOST_ONE) {
+    return bundle_esm.matrix4.makeIdentity();
+  }
+  // the angle is between 0 & 180
+  else {
+    const angle = bundle_esm.vector3.angleTo(normal2, normal1);
+    const axisDirection = bundle_esm.vector3.normalize(bundle_esm.vector3.cross(normal1, normal2));
+    return bundle_esm.matrix4.makeRotation(bundle_esm.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 = bundle_esm.matrix4.makeTranslation(position2);
+  return bundle_esm.matrix4.multiply(bundle_esm.matrix4.multiply(translationDeltaMatrix, rotationMatrix), bundle_esm.matrix4.makeTranslation(bundle_esm.vector3.negate(position1)));
+}
 
+const transformationDelta = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  ALMOST_ONE: ALMOST_ONE,
+  chooseOrthogonalVector: chooseOrthogonalVector,
+  computeRotationMatrix: computeRotationMatrix,
+  computeTransformationDelta: computeTransformationDelta
+});
 
 exports.ColorMaterial = scene.colorMaterial;
 exports.LoadableResource = scene.loadableResource;
@@ -56,15 +126,17 @@ exports.ReceivedFrameScene = streamAttributes.FrameScene;
 exports.ReceivedOrthographicCamera = streamAttributes.FrameOrthographicCamera;
 exports.ReceivedPerspectiveCamera = streamAttributes.FramePerspectiveCamera;
 Object.defineProperty(exports, 'EntityType', {
-	enumerable: true,
-	get: function () {
-		return entities.EntityType;
-	}
+  enumerable: true,
+  get: function () {
+    return entities.EntityType;
+  }
 });
 exports.ArrowMarkup = markup.ArrowMarkup;
 exports.CircleMarkup = markup.CircleMarkup;
 exports.FreeformMarkup = markup.FreeformMarkup;
 exports.Viewport = viewport.Viewport;
-exports.VolumeIntersectionQueryController = controller$1.VolumeIntersectionQueryController;
+exports.TransformController = controller$1.TransformController;
+exports.VolumeIntersectionQueryController = controller$2.VolumeIntersectionQueryController;
+exports.TransformationDelta = transformationDelta;
 
 //# sourceMappingURL=index.cjs.js.map

package/dist/cjs/index.cjs.js.map

@@ -1 +1 @@
-{"file":"index.cjs.js","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","names":[],"sources":[],"sourcesContent":[],"version":3}
+{"file":"index.cjs.js","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEO,MAAM,UAAU,GAAG,MAAM,CAAC;AACjC;;;;;;SAMgB,sBAAsB,CACpC,MAAuB;EAEvB,MAAM,OAAO,GAAGA,kBAAO,CAAC,MAAM,CAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAClB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CACnB,CAAC;EACF,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;EACrE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;EACtE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;EAEvE,MAAM,MAAM,GAAGA,kBAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;EACvC,OAAOA,kBAAO,CAAC,SAAS,CAACA,kBAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;;;;;SAUgB,qBAAqB,CACnC,OAAwB,EACxB,OAAwB;EAExB,MAAM,GAAG,GAAGA,kBAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;;EAE1C,IAAI,GAAG,GAAG,UAAU,EAAE;IACpB,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,UAAU,GAAGC,qBAAU,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,OAAOC,kBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;GACzC;;OAEI,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE;IAC3B,OAAOA,kBAAO,CAAC,YAAY,EAAE,CAAC;GAC/B;;OAEI;IACH,MAAM,KAAK,GAAGF,kBAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,MAAM,aAAa,GAAGA,kBAAO,CAAC,SAAS,CAACA,kBAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACzE,OAAOE,kBAAO,CAAC,YAAY,CACzBD,qBAAU,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CACzD,CAAC;GACH;AACH,CAAC;AAED;;;;;;;;;;;;;SAagB,0BAA0B,CACxC,OAAwB,EACxB,SAA0B,EAC1B,OAAwB,EACxB,SAA0B;EAE1B,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;EAE/D,MAAM,sBAAsB,GAAGC,kBAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;EAClE,OAAOA,kBAAO,CAAC,QAAQ,CACrBA,kBAAO,CAAC,QAAQ,CAAC,sBAAsB,EAAE,cAAc,CAAC,EACxDA,kBAAO,CAAC,eAAe,CAACF,kBAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CACnD,CAAC;AACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","names":["Vector3","Quaternion","Matrix4"],"sources":["./src/lib/transforms/transformation-delta.ts"],"sourcesContent":["import { Matrix4, Quaternion, Vector3 } from '@vertexvis/geometry';\n\nexport const ALMOST_ONE = 0.9999;\n/**\n * For any single vector, there are an infinite number of potential orthogonal vectors. This function will determine\n * one orthogonal vector by crossing the provided vector with a unit vector in the positive X, Y, or Z directions.\n * @param normal\n * @returns\n */\nexport function chooseOrthogonalVector(\n  normal: Vector3.Vector3\n): Vector3.Vector3 {\n  const absNorm = Vector3.create(\n    Math.abs(normal.x),\n    Math.abs(normal.y),\n    Math.abs(normal.z)\n  );\n  const x = absNorm.x < absNorm.y && absNorm.x < absNorm.z ? 1.0 : 0.0;\n  const y = absNorm.y <= absNorm.x && absNorm.y < absNorm.z ? 1.0 : 0.0;\n  const z = absNorm.z <= absNorm.x && absNorm.z <= absNorm.y ? 1.0 : 0.0;\n\n  const vector = Vector3.create(x, y, z);\n  return Vector3.normalize(Vector3.cross(normal, vector));\n}\n\n/**\n * Computes the rotation matrix for two normals. If both normals are neither parallel or anti-parallel,\n * this will compute the rotation matrix delta based on the angle from both normals.\n * If the normals are anti-parallel, the identity matrix will be returned, as no rotation is necessary in this case.\n * If the normals are parallel, an axis direction based on a chosen orthogonal vector will be used\n * to compute the rotation matrix to rotate the plane 180 degrees.\n * @param normal1\n * @param normal2\n * @returns an anti-parallel rotation Matrix4 betwen the given normals\n */\nexport function computeRotationMatrix(\n  normal1: Vector3.Vector3,\n  normal2: Vector3.Vector3\n): Matrix4.Matrix4 {\n  const dot = Vector3.dot(normal1, normal2);\n  // the angle is almost 0 in this case.\n  if (dot > ALMOST_ONE) {\n    const axisDirection = chooseOrthogonalVector(normal1);\n\n    const quaternion = Quaternion.fromAxisAngle(axisDirection, Math.PI);\n    return Matrix4.makeRotation(quaternion);\n  }\n  // the angle is almost 180 in this case.\n  else if (dot <= -ALMOST_ONE) {\n    return Matrix4.makeIdentity();\n  }\n  // the angle is between 0 & 180\n  else {\n    const angle = Vector3.angleTo(normal2, normal1);\n    const axisDirection = Vector3.normalize(Vector3.cross(normal1, normal2));\n    return Matrix4.makeRotation(\n      Quaternion.fromAxisAngle(axisDirection, angle + Math.PI)\n    );\n  }\n}\n\n/**\n * Computes the translation & rotation matrix delta between two world positions and two normals.\n * such that the computed translation matrix will be the delta between position 1 and position 2,\n * and the rotation will be rotated to be anti-parallel.\n *\n * @param normal1\n * @param position1\n * @param normal2\n * @param position2\n *\n * @returns Matrix4 translation matrix delta from position1 to\n * position2 & an anti-parallel rotation delta.\n */\nexport function computeTransformationDelta(\n  normal1: Vector3.Vector3,\n  position1: Vector3.Vector3,\n  normal2: Vector3.Vector3,\n  position2: Vector3.Vector3\n): Matrix4.Matrix4 {\n  const rotationMatrix = computeRotationMatrix(normal1, normal2);\n\n  const translationDeltaMatrix = Matrix4.makeTranslation(position2);\n  return Matrix4.multiply(\n    Matrix4.multiply(translationDeltaMatrix, rotationMatrix),\n    Matrix4.makeTranslation(Vector3.negate(position1))\n  );\n}\n"],"version":3}

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

@@ -9,6 +9,7 @@ const index = require('./index-b99cd335.js');
 const bundle_esm = require('./bundle.esm-5847ff0b.js');
 const index$1 = require('./index-5e1feaea.js');
 const stencil = require('./stencil-507a4f26.js');
+const controller = require('./controller-b93c925e.js');
 const browser_esm = require('./browser.esm-bf5e4488.js');
 const reglComponent = require('./regl-component-5b601d0c.js');
 require('./_commonjsHelpers-77dbcc2e.js');
@@ -17,122 +18,6 @@ require('./bundle.esm-d51532e3.js');
 require('./entities-a2e154e7.js');
 require('./viewport-1f918fe4.js');
 
-class TransformController {
-  constructor(stream) {
-    this.stream = stream;
-    this.isTransforming = false;
-    this.currentDelta = bundle_esm.matrix4.makeIdentity();
-  }
-  async dispose() {
-    if (this.isTransforming) {
-      this.endTransform();
-    }
-  }
-  async beginTransform(delta = bundle_esm.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 = bundle_esm.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 = bundle_esm.matrix4.makeIdentity();
-    }
-  }
-  async endInteraction() {
-    if (this.isTransforming) {
-      await this.stream.endInteraction();
-      this.isTransforming = false;
-      this.currentDelta = bundle_esm.matrix4.makeIdentity();
-    }
-  }
-  clearTransform() {
-    this.currentDelta = bundle_esm.matrix4.makeIdentity();
-    this.endTransform();
-  }
-  toDeltaTransform(delta, columnMajor = false) {
-    const asObject = bundle_esm.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, bounds) {
   return bounds != null
     ? bundle_esm.point.create(point.x - bounds.left, point.y - bounds.top)
@@ -206,8 +91,15 @@ function computeTranslation(current, previous, next, direction) {
   const rotatedDelta = bundle_esm.vector3.multiply(rotatedTranslationAxis, bundle_esm.vector3.subtract(next, previous));
   return rotatedDelta.x + rotatedDelta.y + rotatedDelta.z;
 }
-function computeRotation(rotationAxis, current) {
-  return bundle_esm.matrix4.multiply(bundle_esm.matrix4.multiply(bundle_esm.matrix4.multiply(bundle_esm.matrix4.makeTranslation(bundle_esm.vector3.fromMatrixPosition(current)), bundle_esm.matrix4.makeRotation(rotationAxis)), bundle_esm.matrix4.makeTranslation(bundle_esm.vector3.negate(bundle_esm.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 bundle_esm.matrix4.multiply(bundle_esm.matrix4.multiply(bundle_esm.matrix4.multiply(bundle_esm.matrix4.makeTranslation(bundle_esm.vector3.fromMatrixPosition(current)), bundle_esm.matrix4.makeRotation(rotation)), bundle_esm.matrix4.makeTranslation(bundle_esm.vector3.negate(bundle_esm.vector3.fromMatrixPosition(current)))), current);
 }
 
 function xAxisRotationPositions(widgetTransform, camera, triangleSize = 3) {
@@ -729,6 +621,11 @@ const ViewerTransformWidget = class {
         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 = bundle_esm.matrix4.makeTranslation(this.position);
         this.startingTransform = this.currentTransform;
@@ -760,7 +657,7 @@ const ViewerTransformWidget = class {
         return bundle_esm.matrix4.makeTranslation(newPosition);
       }
     };
-    this.getTransformForHewRotation = (newRotationEuler) => {
+    this.getTransformForNewRotation = (newRotationEuler) => {
       const c = this.currentTransform != null
         ? this.currentTransform
         : bundle_esm.matrix4.makeIdentity();
@@ -835,7 +732,7 @@ const ViewerTransformWidget = class {
     newViewer === null || newViewer === void 0 ? void 0 : newViewer.addEventListener('dimensionschange', this.handleViewerDimensionsChange);
     if ((newViewer === null || newViewer === void 0 ? void 0 : newViewer.stream) != null) {
       (_a = this.controller) === null || _a === void 0 ? void 0 : _a.dispose();
-      this.controller = new TransformController(newViewer.stream);
+      this.controller = new controller.TransformController(newViewer.stream);
     }
   }
   /**
@@ -856,7 +753,7 @@ const ViewerTransformWidget = class {
    */
   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)}]`);