bruce-cesium 7.6.0 → 7.6.1

package/dist/lib/bruce-cesium.js

@@ -89,7 +89,7 @@ __exportStar(require("./widgets/widget-info-view"), exports);
 __exportStar(require("./widgets/widget-left-panel"), exports);
 __exportStar(require("./widgets/widget-nav-compass"), exports);
 __exportStar(require("./widgets/widget-view-bar"), exports);
-exports.VERSION = "7.6.0";
+exports.VERSION = "7.6.1";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.

package/dist/lib/rendering/render-managers/common/entity-label.js

@@ -953,6 +953,22 @@ var EntityLabel;
         return centre && half && (axes === null || axes === void 0 ? void 0 : axes.every(Boolean)) ? { centre, axes, half } : null;
     }
     EntityLabel.ReadOrientedBox = ReadOrientedBox;
+    /*
+     * Whether a placement turns what it places. Scale alone does not count.
+     */
+    function isRotated(matrix) {
+        for (let column = 0; column < 3; column++) {
+            const axis = [0, 1, 2].map(row => Number(matrix[row][column]));
+            const length = Math.hypot(...axis);
+            if (!(length > 0)) {
+                return false;
+            }
+            if (axis.some((value, row) => Math.abs(value / length - Number(row === column)) > 1e-5)) {
+                return true;
+            }
+        }
+        return false;
+    }
     /*
      * The eight padded world corners of an assembly Entity's geometry box, or null when the record cannot give one.
      *
@@ -971,6 +987,10 @@ var EntityLabel;
         if ((matrix === null || matrix === void 0 ? void 0 : matrix.length) !== 4 || !matrix.every(row => (row === null || row === void 0 ? void 0 : row.length) === 4) || !Number.isFinite(+(root === null || root === void 0 ? void 0 : root.latitude)) || !Number.isFinite(+(root === null || root === void 0 ? void 0 : root.longitude))) {
             return null;
         }
+        // A pure translation can hide a rotation baked into the vertices, which leaves the extents loose.
+        if (!shape && !isRotated(matrix)) {
+            return null;
+        }
         const pivot = ((_c = bruce.GeometryPivot) === null || _c === void 0 ? void 0 : _c.length) >= 3 ? bruce.GeometryPivot.slice(0, 3).map(Number) : [0, 0, 0];
         // Without an oriented box the record's own extents are an axis-aligned box about the pivot.
         const box = shape || { centre: pivot, axes: [[1, 0, 0], [0, 1, 0], [0, 0, 1]], half: half };
@@ -2689,7 +2709,7 @@ var EntityLabel;
                     viewportWidth: this.viewer.canvas.clientWidth,
                     id: this.id, entityKey: ((_x = this.rego) === null || _x === void 0 ? void 0 : _x.entityId) ? JSON.stringify([this.rego.entityId, this.rego.menuItemId || "", this.Transient && !this.Persistent ? "hover" : ""]) : undefined,
                     entityId: (_y = this.rego) === null || _y === void 0 ? void 0 : _y.entityId, group: this.groupId, x, y, width, height, anchorX, anchorY, depth, leaderLength, leaderRun, leaderSide, distance,
-                    iconRadius: icon === null || icon === void 0 ? void 0 : icon.radius, modelBox: boxed || undefined, boxBlend,
+                    iconRadius: icon === null || icon === void 0 ? void 0 : icon.radius, modelBox: boxed || undefined, boxBlend, follows: !pinned && Boolean(transientPivot || cursorMotion.target),
                     // Priority shows the hovered member individually without dragging its cluster along.
                     opacity: waiting ? 0 : opacity, priority: hover || cursorAmount > 0 || (state === null || state === void 0 ? void 0 : state.highlighted) ? 1 : 0, options: this.options, text: originalText, clusterBounds
                 };
@@ -2816,15 +2836,16 @@ var EntityLabel;
                 const normalRadius = (!leader || (ring === null || ring === void 0 ? void 0 : ring.enabled) === false ? 0 : Math.max(frame.distance <= ((_l = ring === null || ring === void 0 ? void 0 : ring.nearDistance) !== null && _l !== void 0 ? _l : 100) ? ((_m = ring === null || ring === void 0 ? void 0 : ring.nearRadius) !== null && _m !== void 0 ? _m : 10) : 0, hovered ? ((_o = ring === null || ring === void 0 ? void 0 : ring.hoverRadius) !== null && _o !== void 0 ? _o : (this.Transient && !this.Persistent ? 15.4 : 22)) : 0));
                 const targetRadius = normalRadius + (15.4 - normalRadius) * cursorMotion.amount;
                 // Around a glyph the ring keeps the glyph's size and only fades its stroke in, so it never covers the icon.
-                const targetOuter = iconRing || targetRadius || 2.5;
-                const targetInner = iconRing ? (targetRadius > 0 ? iconRing - 2 : iconRing) : Math.max(0, targetRadius - 2);
+                // A ring around the cursor marks nothing, so a riding label keeps only its leader.
+                const targetOuter = frame.follows ? 0 : iconRing || targetRadius || 2.5;
+                const targetInner = frame.follows ? 0 : iconRing ? (targetRadius > 0 ? iconRing - 2 : iconRing) : Math.max(0, targetRadius - 2);
                 const now = Date.now();
                 const duration = (_p = ring === null || ring === void 0 ? void 0 : ring.transitionDuration) !== null && _p !== void 0 ? _p : 200;
                 const sharedRing = this.Transient && !this.Persistent && this.hoverFade.to === 1 ? this.hoverRingState : undefined;
                 let ringAnimation = sharedRing ? sharedRing.animation : this.ringAnimation;
                 if (!ringAnimation) {
-                    const outer = iconRing || 2.5;
-                    const inner = iconRing;
+                    const outer = frame.follows ? 0 : iconRing || 2.5;
+                    const inner = frame.follows ? 0 : iconRing;
                     ringAnimation = { target: outer, targetInner: inner, start: now, outer, inner, fromOuter: outer, fromInner: inner };
                 }
                 ;