bruce-cesium 7.6.4 → 7.6.6

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

@@ -1771,6 +1771,8 @@ var EntityLabel;
             this.modelBox = null;
             this.boxMorph = { value: 0, from: 0, target: 0, start: 0, anchor: undefined, group: undefined,
                 shift: { x: 0, y: 0, start: 0 } };
+            // A CAD part's record and its tileset, so the label stays on the part wherever the tileset is drawn now.
+            this.tilesetPart = null;
             // Counter to help differentiate between createLabel calls.
             this.counter = 0;
             // Whether this label has asked its group for a default image, which it does once on screen.
@@ -2080,6 +2082,9 @@ var EntityLabel;
                 return;
             }
             this._pos3d = pos3d;
+            if (!this.prePositioned && visual instanceof Cesium.Cesium3DTileFeature) {
+                this.followTilesetPart(visual, counter);
+            }
             let text = "Unknown Entity";
             const additionalTexts = this.additionalTexts ? this.additionalTexts : [];
             if (this.rego) {
@@ -2541,13 +2546,12 @@ 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 motion = this.motionAt(this.viewer.clock.currentTime);
                     const centre = Cesium.Cartesian3.midpoint(corners[0], corners[7], new Cesium.Cartesian3());
                     if (motion) {
                         Cesium.Matrix4.multiplyByPoint(motion, centre, centre);
@@ -2559,7 +2563,8 @@ 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,
+                        // Asked each frame, since a CAD part's tileset may only be known once its record is read.
+                        motion: () => this.motionAt(this.viewer.clock.currentTime),
                         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: () => {
@@ -2593,6 +2598,12 @@ var EntityLabel;
                             desiredHeightRef: Cesium.HeightReference.NONE, heightRef, pos3d: position, viewer: this.viewer
                         });
                 }
+                // A CAD part sits where its tileset is drawn this frame.
+                else if (!this.prePositioned && this.tilesetPart) {
+                    const { tileset, entity } = this.tilesetPart;
+                    const rootFrame = entity_utils_1.EntityUtils.GetTilesetRootFrame(tileset);
+                    this._pos3d = (rootFrame && entity_utils_1.EntityUtils.GetAssemblyPartPos3d({ viewer: this.viewer, entity, rootFrame })) || this._pos3d;
+                }
                 if (!Number.isFinite((_b = this._pos3d) === null || _b === void 0 ? void 0 : _b.x)) {
                     return null;
                 }
@@ -3331,6 +3342,43 @@ var EntityLabel;
             };
             step();
         }
+        /*
+         * Keeps a label on a CAD Assembly part where its tileset is drawn, which a record cannot know as it moves.
+         */
+        async followTilesetPart(feature, counter) {
+            var _a, _b, _c;
+            const known = (_c = (_b = (_a = this.visualRegister) === null || _a === void 0 ? void 0 : _a.GetLabelGroupFor(this.rego.entityId, this.rego.menuItemId)) === null || _b === void 0 ? void 0 : _b.item) === null || _c === void 0 ? void 0 : _c.entity;
+            let entity = entity_utils_1.EntityUtils.IsAssemblyPart(known) ? known : null;
+            if (!entity && this.api) {
+                try {
+                    entity = (await bruce_models_1.Entity.Get({ api: this.api, entityId: this.rego.entityId, expandLocation: true, migrated: true })).entity;
+                }
+                // Expanding location fails for entities outside an assembly, which keep the position already found.
+                catch {
+                    return;
+                }
+            }
+            const record = entity_utils_1.EntityUtils.GetAssemblyRecordFrame(entity);
+            if (!record || this.disposed || this.counter !== counter || !feature.tileset) {
+                return;
+            }
+            this.tilesetPart = { tileset: feature.tileset, entity, record };
+            this.viewer.scene.requestRender();
+        }
+        /*
+         * Rigid motion from where the record places this Entity to where it is drawn, see IVisualRego.motion.
+         * A CAD part has none of its own, so it moves with its tileset.
+         */
+        motionAt(time) {
+            var _a, _b;
+            const own = (_b = (_a = this.rego) === null || _a === void 0 ? void 0 : _a.motion) === null || _b === void 0 ? void 0 : _b.call(_a, time);
+            if (own || !this.tilesetPart) {
+                return own !== null && own !== void 0 ? own : null;
+            }
+            const drawn = entity_utils_1.EntityUtils.GetTilesetRootFrame(this.tilesetPart.tileset);
+            const inverse = Cesium.Matrix4.inverseTransformation(this.tilesetPart.record, new Cesium.Matrix4());
+            return drawn ? Cesium.Matrix4.multiply(drawn, inverse, inverse) : null;
+        }
         /*
          * Reads the record's geometry box, preferring an entity a label group already hydrated.
          */