@vertexvis/viewer 0.13.2-canary.4 → 0.13.2-canary.7

package/dist/cjs/{browser.esm-c51162f8.js → browser.esm-075810bf.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
 
 /**
  * Adds a listener to the given `target`, and returns a promise that

package/dist/cjs/{bundle.esm-1b8b1f36.js → bundle.esm-618a5fe9.js}

@@ -151,7 +151,7 @@ function lerp$2(a, b, t) {
 /**
  * Returns a new `Point` with the given horizontal and vertical position.
  */
-function create$b(x, y) {
+function create$c(x, y) {
     if (x === void 0) { x = 0; }
     if (y === void 0) { y = 0; }
     return { x: x, y: y };
@@ -162,7 +162,7 @@ function create$b(x, y) {
 function polar(length, radians) {
     var x = Math.cos(radians) * length;
     var y = Math.sin(radians) * length;
-    return create$b(x, y);
+    return create$c(x, y);
 }
 /**
  * Returns the distance between two points.
@@ -208,7 +208,7 @@ function lerp$1(a, b, t) {
  * Returns a new `Point` where `x` and `y` are inverted.
  */
 function negate$1(pt) {
-    return create$b(-pt.x, -pt.y);
+    return create$c(-pt.x, -pt.y);
 }
 /**
  * Returns a new `Point` where `x` and `y` are multiplied by the given scale
@@ -230,17 +230,17 @@ function fromJson$4(json) {
     var obj = JSON.parse(json);
     if (Array.isArray(obj)) {
         var x = obj[0], y = obj[1];
-        return create$b(x, y);
+        return create$c(x, y);
     }
     else {
         var x = obj.x, y = obj.y;
-        return create$b(x, y);
+        return create$c(x, y);
     }
 }
 
 var point = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  create: create$b,
+  create: create$c,
   polar: polar,
   distance: distance$2,
   subtract: subtract$1,
@@ -565,7 +565,7 @@ function makeOrthographic(left, right, bottom, top, near, far) {
     var d = 1.0 / (far - near);
     var x = (right + left) * w;
     var y = (top + bottom) * h;
-    var z = (far + near) / d;
+    var z = (far + near) * d;
     /* eslint-disable prettier/prettier */
     return [
         2 * w, 0, 0, -x,
@@ -848,7 +848,7 @@ var matrix4 = /*#__PURE__*/Object.freeze({
   isType: isType$2
 });
 
-function create$a() {
+function create$b() {
     var _a, _b, _c, _d, _e, _f;
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -912,11 +912,11 @@ function fromJson$3(json) {
     var obj = JSON.parse(json);
     if (Array.isArray(obj)) {
         var x = obj[0], y = obj[1], z = obj[2];
-        return create$a(x, y, z);
+        return create$b(x, y, z);
     }
     else {
         var x = obj.x, y = obj.y, z = obj.z;
-        return create$a(x, y, z);
+        return create$b(x, y, z);
     }
 }
 /**
@@ -931,7 +931,7 @@ function fromArray(nums, offset) {
     var x = nums[offset];
     var y = nums[offset + 1];
     var z = nums[offset + 2];
-    return create$a(x, y, z);
+    return create$b(x, y, z);
 }
 /**
  * Converts a Vector3 to an array where the values of the vector will be
@@ -948,43 +948,43 @@ function toArray(_a) {
  * Returns a directional vector on the positive x axis, Vector3(1, 0, 0).
  */
 function right() {
-    return create$a(1, 0, 0);
+    return create$b(1, 0, 0);
 }
 /**
  * Returns a directional vector on the positive y axis, Vector3(0, 1, 0).
  */
 function up() {
-    return create$a(0, 1, 0);
+    return create$b(0, 1, 0);
 }
 /**
  * Returns a directional vector on the positive z axis, Vector3(0, 0, -1).
  */
 function forward() {
-    return create$a(0, 0, -1);
+    return create$b(0, 0, -1);
 }
 /**
  * Returns a directional vector on the negative x axis, Vector3(-1, 0, 0).
  */
 function left() {
-    return create$a(-1, 0, 0);
+    return create$b(-1, 0, 0);
 }
 /**
  * Returns a directional vector on the negative y axis, Vector3(0, -1, 0).
  */
 function down() {
-    return create$a(0, -1, 0);
+    return create$b(0, -1, 0);
 }
 /**
  * Returns a directional vector on the negative z axis, Vector3(0, 0, 1).
  */
 function back() {
-    return create$a(0, 0, 1);
+    return create$b(0, 0, 1);
 }
 /**
  * Returns a vector at the origin, Vector3(0, 0, 0).
  */
 function origin() {
-    return create$a(0, 0, 0);
+    return create$b(0, 0, 0);
 }
 /**
  * Returns a vector with that will have a magnitude of 1.
@@ -1167,13 +1167,13 @@ function isEqual$2(a, b) {
  * Returns a vector that contains the largest components of `a` and `b`.
  */
 function max(a, b) {
-    return create$a(Math.max(a.x, b.x), Math.max(a.y, b.y), Math.max(a.z, b.z));
+    return create$b(Math.max(a.x, b.x), Math.max(a.y, b.y), Math.max(a.z, b.z));
 }
 /**
  * Returns a vector that contains the smallest components of `a` and `b`.
  */
 function min(a, b) {
-    return create$a(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z));
+    return create$b(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z));
 }
 /**
  * Returns a vector that each of its component negated.
@@ -1211,7 +1211,7 @@ function transformNdcToWorldSpace(ndc, worldMatrix, projectionMatrixInverse) {
 
 var vector3 = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  create: create$a,
+  create: create$b,
   isValid: isValid,
   fromMatrixScale: fromMatrixScale,
   fromMatrixPosition: fromMatrixPosition,
@@ -1251,7 +1251,7 @@ var vector3 = /*#__PURE__*/Object.freeze({
 /**
  * Returns a `BoundingBox` with the given min and max points.
  */
-var create$9 = function (min, max) {
+var create$a = function (min, max) {
     return { min: min, max: max };
 };
 /**
@@ -1259,7 +1259,7 @@ var create$9 = function (min, max) {
  * are contained by the bounding box.
  */
 var fromVectors = function (vectors) {
-    return union.apply(void 0, vectors.map(function (v) { return create$9(v, v); }));
+    return union.apply(void 0, vectors.map(function (v) { return create$a(v, v); }));
 };
 /**
  * Returns the center point of the given `BoundingBox`.
@@ -1274,19 +1274,36 @@ function union(box) {
     }
     var boxes = __spreadArray([box], rest, true);
     return boxes.reduce(function (a, b) {
-        return create$9(min(a.min, b.min), max(a.max, b.max));
+        return create$a(min(a.min, b.min), max(a.max, b.max));
     });
 }
 /* eslint-enable padding-line-between-statements */
 
 var boundingBox = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  create: create$9,
+  create: create$a,
   fromVectors: fromVectors,
   center: center$3,
   union: union
 });
 
+/**
+ * Returns a `BoundingSphere` that encompasses the provided `BoundingBox`.
+ */
+var create$9 = function (boundingBox$1) {
+    var boundingBoxCenter = center$3(boundingBox$1);
+    var centerToBoundingPlane = subtract(boundingBox$1.max, boundingBoxCenter);
+    var radius = magnitude(centerToBoundingPlane);
+    var length = Math.max(radius, magnitude(boundingBoxCenter));
+    var epsilon = length === 0 ? 1.0 : length * 1e-6;
+    return { center: boundingBoxCenter, radius: radius, epsilon: epsilon };
+};
+
+var boundingSphere = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  create: create$9
+});
+
 /**
  * Returns a new `Rectangle` with the given position and size.
  */
@@ -1408,13 +1425,13 @@ function center$2(rect) {
  * Returns the top-left position of the rectangle, as a point.
  */
 function topLeft(rect) {
-    return create$b(rect.x, rect.y);
+    return create$c(rect.x, rect.y);
 }
 /**
  * Returns the bottom-right position of the rectangle, as a point.
  */
 function bottomRight(rect) {
-    return create$b(rect.x + rect.width, rect.y + rect.height);
+    return create$c(rect.x + rect.width, rect.y + rect.height);
 }
 /**
  * Returns `true` if the given rectangle has a portrait aspect ratio.
@@ -1619,7 +1636,7 @@ var fitToRatio = function (ratio, dimensions) {
  * Converts a dimension to a rectangle, with an optional position.
  */
 function toRectangle(dimensions, position) {
-    if (position === void 0) { position = create$b(); }
+    if (position === void 0) { position = create$c(); }
     return fromPointAndDimensions(position, dimensions);
 }
 
@@ -1921,7 +1938,7 @@ var translate = function (dx, dy, matrix) {
 var transformPoint = function (matrix, pt) {
     var x = matrix.a * pt.x + matrix.c * pt.y + matrix.tx;
     var y = matrix.b * pt.x + matrix.d * pt.y + matrix.ty;
-    return create$b(x, y);
+    return create$c(x, y);
 };
 
 var matrix = /*#__PURE__*/Object.freeze({
@@ -2321,6 +2338,7 @@ exports.__rest = __rest;
 exports.__spreadArray = __spreadArray;
 exports.angle = angle;
 exports.boundingBox = boundingBox;
+exports.boundingSphere = boundingSphere;
 exports.clamp = clamp;
 exports.dimensions = dimensions;
 exports.euler = euler;

package/dist/cjs/{config-74a42c43.js → config-fb124bac.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const browser_esm = require('./browser.esm-c51162f8.js');
-require('./streamAttributes-2061be12.js');
+const browser_esm = require('./browser.esm-075810bf.js');
+require('./streamAttributes-81eb52f2.js');
 
 const DEFAULT_ANIMATION_DURATION = 500;
 const defaultAnimationConfig = {

package/dist/cjs/{cursors-14827f58.js → cursors-d71f6a74.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const browser_esm = require('./browser.esm-c51162f8.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 /**
  * The cursor manager maintains a prioritized list of cursors for the viewer.

package/dist/cjs/{dom-c697cf99.js → dom-57ef84e9.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
 
 function getMouseClientPosition(event, offsets) {
   const pt = bundle_esm.point.create(event.clientX, event.clientY);

package/dist/cjs/{entities-4e61087e.js → entities-90f1347a.js}

@@ -3,10 +3,10 @@
  */
 'use strict';
 
-const mapper = require('./mapper-1aafd2e8.js');
+const mapper = require('./mapper-80ee2957.js');
 const grpcWebClient_umd = require('./grpc-web-client.umd-60a79aae.js');
-const streamAttributes = require('./streamAttributes-2061be12.js');
-const browser_esm = require('./browser.esm-c51162f8.js');
+const streamAttributes = require('./streamAttributes-81eb52f2.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 function requestUnary(caller) {
   return new Promise((resolve, reject) => {

package/dist/cjs/index.cjs.js

@@ -5,18 +5,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const scene = require('./scene-91da8d7b.js');
-const cursors = require('./cursors-14827f58.js');
-const entities = require('./entities-4e61087e.js');
-const model = require('./model-78241d4f.js');
-const overlays = require('./overlays-06786e52.js');
-const results = require('./results-7a694238.js');
-const streamAttributes = require('./streamAttributes-2061be12.js');
-const markup = require('./markup-835f2e83.js');
-const viewport = require('./viewport-052809c7.js');
-require('./browser.esm-c51162f8.js');
-require('./bundle.esm-1b8b1f36.js');
-require('./mapper-1aafd2e8.js');
+const scene = require('./scene-92728420.js');
+const cursors = require('./cursors-d71f6a74.js');
+const entities = require('./entities-90f1347a.js');
+const model = require('./model-55abd9ab.js');
+const overlays = require('./overlays-68e8eff2.js');
+const results = require('./results-e9496869.js');
+const streamAttributes = require('./streamAttributes-81eb52f2.js');
+const markup = require('./markup-7f7de5f2.js');
+const viewport = require('./viewport-54b1389d.js');
+require('./browser.esm-075810bf.js');
+require('./bundle.esm-618a5fe9.js');
+require('./mapper-80ee2957.js');
 require('./_commonjsHelpers-537d719a.js');
 require('./grpc-web-client.umd-60a79aae.js');
 

package/dist/cjs/{mapper-1aafd2e8.js → mapper-80ee2957.js}

@@ -5,8 +5,8 @@
 
 const _commonjsHelpers = require('./_commonjsHelpers-537d719a.js');
 const grpcWebClient_umd = require('./grpc-web-client.umd-60a79aae.js');
-const browser_esm = require('./browser.esm-c51162f8.js');
-const streamAttributes = require('./streamAttributes-2061be12.js');
+const browser_esm = require('./browser.esm-075810bf.js');
+const streamAttributes = require('./streamAttributes-81eb52f2.js');
 
 var uuid_pb = _commonjsHelpers.createCommonjsModule(function (module, exports) {
 /**

package/dist/cjs/{markup-835f2e83.js → markup-7f7de5f2.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
-const browser_esm = require('./browser.esm-c51162f8.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 class ArrowMarkup {
   constructor(init) {

package/dist/cjs/{measurement-8e0ce89a.js → measurement-f1ae9248.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
-const browser_esm = require('./browser.esm-c51162f8.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 class DistanceMeasurement {
   constructor(init) {

package/dist/cjs/{model-78241d4f.js → model-55abd9ab.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const browser_esm = require('./browser.esm-c51162f8.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 /**
  * A model representing the state of measurement.

package/dist/cjs/{overlays-06786e52.js → overlays-68e8eff2.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
-const browser_esm = require('./browser.esm-c51162f8.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
+const browser_esm = require('./browser.esm-075810bf.js');
 
 class MeasurementOverlayManager {
   constructor() {

package/dist/cjs/{png-decoder-01b76242.js → png-decoder-076131d8.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
 const _commonjsHelpers = require('./_commonjsHelpers-537d719a.js');
 
 const DefaultErrorSerializer = {

package/dist/cjs/{results-7a694238.js → results-e9496869.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
 
 /**
  * Constructs a new measurement result from the given points.

package/dist/cjs/{scene-91da8d7b.js → scene-92728420.js}

@@ -3,9 +3,9 @@
  */
 'use strict';
 
-const browser_esm = require('./browser.esm-c51162f8.js');
-const bundle_esm = require('./bundle.esm-1b8b1f36.js');
-const streamAttributes = require('./streamAttributes-2061be12.js');
+const browser_esm = require('./browser.esm-075810bf.js');
+const bundle_esm = require('./bundle.esm-618a5fe9.js');
+const streamAttributes = require('./streamAttributes-81eb52f2.js');
 
 const defaultColor = {
   opacity: 100,
@@ -608,15 +608,7 @@ class Camera {
     this.decodeFrame = decodeFrame;
     this.flyToOptions = flyToOptions;
   }
-  fitCameraToBoundingBox(boundingBox, fovVertical, viewVector) {
-    const radius = 1.1 *
-      bundle_esm.vector3.magnitude(bundle_esm.vector3.subtract(boundingBox.max, bundle_esm.boundingBox.center(boundingBox)));
-    // ratio of the height of the frustum to the distance along the view vector
-    let hOverD = Math.tan(fovVertical * PI_OVER_360);
-    if (this.aspect < 1.0) {
-      hOverD *= this.aspect;
-    }
-    const distance = Math.abs(radius / hOverD);
+  fitCameraToBoundingBox(boundingBox, distance, viewVector) {
     const vvec = bundle_esm.vector3.scale(distance, bundle_esm.vector3.normalize(viewVector));
     const lookAt = bundle_esm.boundingBox.center(boundingBox);
     const position = bundle_esm.vector3.subtract(lookAt, vvec);
@@ -714,6 +706,7 @@ class Camera {
   standardView(standardView) {
     return this.update({
       position: standardView.position,
+      viewVector: bundle_esm.vector3.subtract(bundle_esm.vector3.origin(), standardView.position),
       lookAt: bundle_esm.vector3.origin(),
       up: standardView.up,
     });
@@ -765,7 +758,15 @@ class PerspectiveCamera extends Camera {
   }
   fitToBoundingBox(boundingBox) {
     var _a;
-    return super.fitCameraToBoundingBox(boundingBox, (_a = this.fovY) !== null && _a !== void 0 ? _a : 45, this.viewVector);
+    const radius = 1.1 *
+      bundle_esm.vector3.magnitude(bundle_esm.vector3.subtract(boundingBox.max, bundle_esm.boundingBox.center(boundingBox)));
+    // ratio of the height of the frustum to the distance along the view vector
+    let hOverD = Math.tan(((_a = this.fovY) !== null && _a !== void 0 ? _a : 45) * PI_OVER_360);
+    if (this.aspect < 1.0) {
+      hOverD *= this.aspect;
+    }
+    const distance = Math.abs(radius / hOverD);
+    return super.fitCameraToBoundingBox(boundingBox, distance, this.viewVector);
   }
   update(camera) {
     return new PerspectiveCamera(this.stream, this.aspect, Object.assign(Object.assign({}, this.perspectiveData), camera), this.boundingBox, this.decodeFrame, this.flyToOptions);
@@ -837,30 +838,34 @@ class OrthographicCamera extends Camera {
    * axis.
    */
   moveBy(delta) {
-    const updatedLookAt = bundle_esm.vector3.add(this.lookAt, delta);
     return this.update({
-      viewVector: bundle_esm.vector3.subtract(updatedLookAt, bundle_esm.vector3.add(this.position, delta)),
-      lookAt: updatedLookAt,
+      lookAt: bundle_esm.vector3.add(this.lookAt, delta),
     });
   }
   rotateAroundAxisAtPoint(angleInRadians, point, axis) {
-    const newLookAt = bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.lookAt, axis, point);
-    const newUp = bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.up, axis, bundle_esm.vector3.origin());
-    const newViewVector = bundle_esm.vector3.subtract(bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.position, axis, point), newLookAt);
+    const updatedLookAt = bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.lookAt, axis, point);
+    const updatedPosition = bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.position, axis, point);
+    const viewVector = streamAttributes.constrainViewVector(bundle_esm.vector3.subtract(updatedLookAt, updatedPosition), bundle_esm.boundingSphere.create(this.boundingBox));
     return this.update({
-      viewVector: newViewVector,
-      lookAt: newLookAt,
-      up: newUp,
+      viewVector: viewVector,
+      lookAt: updatedLookAt,
+      up: bundle_esm.vector3.rotateAboutAxis(angleInRadians, this.up, axis, bundle_esm.vector3.origin()),
     });
   }
   fitToBoundingBox(boundingBox) {
-    return super.fitCameraToBoundingBox(boundingBox, this.fovHeight, this.viewVector);
+    const boundingSphere = bundle_esm.boundingSphere.create(boundingBox);
+    const fitAll = super.fitCameraToBoundingBox(boundingBox, boundingSphere.radius, this.viewVector);
+    return this.update({
+      lookAt: fitAll.lookAt,
+      viewVector: fitAll.viewVector,
+      fovHeight: boundingSphere.radius * 2,
+    });
   }
   update(camera) {
     return new OrthographicCamera(this.stream, this.aspect, Object.assign(Object.assign({}, this.orthographicData), camera), this.boundingBox, this.decodeFrame, this.flyToOptions);
   }
   toFrameCamera() {
-    return new streamAttributes.FrameOrthographicCamera(this.viewVector, this.lookAt, this.up, this.near, this.far, this.aspectRatio, this.fovHeight);
+    return new streamAttributes.FrameOrthographicCamera(streamAttributes.constrainViewVector(this.viewVector, bundle_esm.boundingSphere.create(this.boundingBox)), this.lookAt, this.up, this.near, this.far, this.aspectRatio, this.fovHeight);
   }
   get viewVector() {
     return Object.assign({}, this.orthographicData.viewVector);