bruce-cesium 7.6.1 → 7.6.3

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

@@ -9,6 +9,7 @@ const drawing_utils_1 = require("../../../utils/drawing-utils");
 const measure_utils_1 = require("../../../utils/measure-utils");
 const bruce_models_1 = require("bruce-models");
 const point_clustering_core_1 = require("./point-clustering-core");
+const entity_simulation_1 = require("./entity-simulation");
 /**
  * Returns cesium property's value.
  * This will check if it's one that changes over time, or just a fixed value.
@@ -64,6 +65,8 @@ var EntityLabel;
     const PHOTO_CACHE_KEY = "_nextspaceLabelPhotos";
     // Clearance around a model's box, as a share of its half-extent on each axis.
     const MODEL_BOX_PADDING = 0.02;
+    // How far a moving model's box may drift before it is moved, in metres.
+    const MODEL_BOX_FOLLOW_TOLERANCE = 0.001;
     // Share of each edge drawn out from its corners while the box is idle. Hovering draws the edges whole.
     const MODEL_BOX_BRACKET = 0.2;
     // Under this many pixels across, a box reads as a smudge and the ring takes over.
@@ -1281,6 +1284,7 @@ var EntityLabel;
         constructor() {
             // Whether a box competes for space comes only from inputs (camera distance, hover, the pointer), never from
             // how its label was laid out, so an animation moving a label cannot feed back into which boxes show.
+            // corners is where the box is drawn this frame: stored, moved by the entry's motion.
             this.entries = new Map();
             this.groups = null;
             // The hovered Entity. Its box is drawn on its own and whole, ahead of every other box.
@@ -1298,7 +1302,7 @@ var EntityLabel;
         Set(id, corners, entityId, inputs) {
             const current = this.entries.get(id);
             // A label rebuilt over the same box keeps its place and how far it has animated.
-            if (corners && (current === null || current === void 0 ? void 0 : current.corners) === corners && current.entityId === entityId) {
+            if (corners && (current === null || current === void 0 ? void 0 : current.stored) === corners && current.entityId === entityId) {
                 Object.assign(current, inputs);
                 return;
             }
@@ -1306,17 +1310,41 @@ var EntityLabel;
                 return;
             }
             if (corners) {
-                this.entries.set(id, { ...inputs, corners, entityId, active: false, wanted: false });
+                this.entries.set(id, { ...inputs, corners, stored: corners, entityId, active: false, wanted: false });
             }
             else
                 this.entries.delete(id);
             this.since.delete(id);
+            this.forget(id);
+        }
+        /*
+         * Drops the groups and outlines a box was in, so they are worked out again from where it is now.
+         */
+        forget(id) {
             this.groups = null;
             for (const [key, group] of this.outlines) {
                 if (group.members.includes(id))
                     this.outlines.delete(key);
             }
         }
+        /*
+         * Moves each box whose model moved since the last frame, keeping where it has got to in showing.
+         */
+        follow() {
+            var _a;
+            for (const [id, entry] of this.entries) {
+                const motion = (_a = entry.motion) === null || _a === void 0 ? void 0 : _a.call(entry);
+                if (!motion) {
+                    continue;
+                }
+                const moved = entry.stored.map(corner => Cesium.Matrix4.multiplyByPoint(motion, corner, new Cesium.Cartesian3()));
+                if (moved.every((corner, i) => Cesium.Cartesian3.equalsEpsilon(corner, entry.corners[i], 0, MODEL_BOX_FOLLOW_TOLERANCE))) {
+                    continue;
+                }
+                entry.corners = moved;
+                this.forget(id);
+            }
+        }
         /*
          * The box drawn for a label this frame, or undefined when it has none or lost its place.
          */
@@ -1384,6 +1412,7 @@ var EntityLabel;
          */
         Resolve(viewer, pointer) {
             var _a, _b, _c, _d;
+            this.follow();
             this.frames.clear();
             this.hulls.clear();
             this.drawn = [];
@@ -1806,9 +1835,16 @@ var EntityLabel;
                 }
                 if (this.api) {
                     const rego = this.rego;
+                    const simulation = entity_simulation_1.EntitySimulation.Get(this.viewer);
+                    let simulated = null;
+                    if (simulation === null || simulation === void 0 ? void 0 : simulation.HasBlob(rego.entityId)) {
+                        // A stand-in is named as is; a patch is laid over the API's record first.
+                        const read = simulation.HasEntity(rego.entityId) ? null : (await bruce_models_1.Entity.Get({ api: this.api, entityId: rego.entityId, migrated: true })).entity;
+                        simulated = simulation.Resolve(rego.entityId, read);
+                    }
                     this.rego.name = await bruce_models_1.Entity.CalculateNameAsync({
                         api: this.api,
-                        entity: null,
+                        entity: simulated,
                         entityId: rego.entityId,
                         defaultToId: false
                     });
@@ -1837,6 +1873,21 @@ var EntityLabel;
             clearTimeout(this.loadTimeout);
             this.loadTimeout = null;
         }
+        /*
+         * Reads the label's Entity again and redraws it, eg. after what is simulated for it changed.
+         */
+        Reload() {
+            if (this.disposed) {
+                return;
+            }
+            this.additionalTexts = this.options.text != null ? [] : null;
+            this.loadedName = false;
+            // The name came from whatever record the visual was drawn from, so it is worked out again too.
+            if (this.rego) {
+                this.rego.name = null;
+            }
+            this.createLabel();
+        }
         /*
          * Rebuilds only when configuration changes; state refreshes must not recreate DOM every frame.
          */
@@ -2067,7 +2118,7 @@ var EntityLabel;
                     }
                     clearTimeout(this.loadTimeout);
                     this.loadTimeout = setTimeout(async () => {
-                        var _a, _b, _c, _d, _e;
+                        var _a, _b, _c, _d, _e, _f;
                         if (this.disposed || this.counter != counter) {
                             return;
                         }
@@ -2094,16 +2145,19 @@ var EntityLabel;
                                 const attributes = (_a = this.options.attributes) !== null && _a !== void 0 ? _a : (_c = (_b = entityType === null || entityType === void 0 ? void 0 : entityType.VisualSettings) === null || _b === void 0 ? void 0 : _b.label) === null || _c === void 0 ? void 0 : _c.attributes;
                                 // Read for its attributes, and for a photo when the label has no icon of its own.
                                 if (attributes || !HasIcon(this.options)) {
-                                    let entity = null;
+                                    // A simulated stand-in is labelled as is, and a patch is laid over the API's.
+                                    const simulation = entity_simulation_1.EntitySimulation.Get(this.viewer);
+                                    let entity = (_d = simulation === null || simulation === void 0 ? void 0 : simulation.GetEntity(this.rego.entityId)) !== null && _d !== void 0 ? _d : null;
                                     try {
-                                        entity = (await bruce_models_1.Entity.Get({
+                                        entity = entity !== null && entity !== void 0 ? entity : (await bruce_models_1.Entity.Get({
                                             api: this.api,
                                             entityId: this.rego.entityId,
-                                            scenario: ((_d = this.rego.outline) === null || _d === void 0 ? void 0 : _d.length) ? (_e = this.rego.outline.find(x => !!x.Scenario)) === null || _e === void 0 ? void 0 : _e.Scenario : null,
+                                            scenario: ((_e = this.rego.outline) === null || _e === void 0 ? void 0 : _e.length) ? (_f = this.rego.outline.find(x => !!x.Scenario)) === null || _f === void 0 ? void 0 : _f.Scenario : null,
                                             schemaId: this.rego.schema,
                                             migrated: true,
                                             expandAttachments: !HasIcon(this.options)
                                         })).entity;
+                                        entity = entity && simulation ? simulation.Resolve(this.rego.entityId, entity) : entity;
                                     }
                                     // Entity doesn't exist.
                                     // Likely a graphic with an ID that points to no record.
@@ -2487,11 +2541,17 @@ var EntityLabel;
                 // Past the wait a slow record no longer holds the label back; a box that comes later eases in.
                 setTimeout(settle, MODEL_BOX_WAIT);
                 this.modelBox.load.then(corners => {
+                    var _a, _b;
                     if (!corners || this.disposed || this.counter !== counter) {
                         return;
                     }
                     // A record that disagrees with where the model was found describes another placement, such as a moved tileset.
+                    // A part known to have moved from its record, eg. a joint turning, is judged where it has moved to.
+                    const motion = (_b = (_a = this.rego) === null || _a === void 0 ? void 0 : _a.motion) === null || _b === void 0 ? void 0 : _b.call(_a, this.viewer.clock.currentTime);
                     const centre = Cesium.Cartesian3.midpoint(corners[0], corners[7], new Cesium.Cartesian3());
+                    if (motion) {
+                        Cesium.Matrix4.multiplyByPoint(motion, centre, centre);
+                    }
                     if (Cesium.Cartesian3.distance(centre, found) > Cesium.Cartesian3.distance(corners[0], corners[7]) * 0.75 + 2) {
                         return;
                     }
@@ -2499,6 +2559,7 @@ var EntityLabel;
                     // Let go a little further out than it is taken, so a camera resting at the limit does not flip it.
                     let near = false;
                     layer.modelBoxes.Set(this.id, corners, rego.entityId, {
+                        motion: rego.motion ? () => rego.motion(this.viewer.clock.currentTime) : undefined,
                         selected: () => { var _a, _b; return Boolean((_b = (_a = this.visualRegister) === null || _a === void 0 ? void 0 : _a.GetState({ entityId: rego.entityId, menuItemId: rego.menuItemId })) === null || _b === void 0 ? void 0 : _b.selected); },
                         hovered: () => { var _a, _b; return Boolean((_b = (_a = this.visualRegister) === null || _a === void 0 ? void 0 : _a.IsLabelHovered) === null || _b === void 0 ? void 0 : _b.call(_a, rego.entityId, rego.menuItemId)); },
                         near: () => {