bruce-cesium 6.2.2 → 6.2.4

package/dist/bruce-cesium.umd.js

@@ -20905,6 +20905,72 @@
         DataSourceStaticKmlManager.Manager = Manager;
     })(exports.DataSourceStaticKmlManager || (exports.DataSourceStaticKmlManager = {}));
 
+    (function (XGridsRenderEngine) {
+        function Render(params) {
+            var _a, _b, _c;
+            const { api, viewer, tileset } = params;
+            if (!LCCRender) {
+                console.warn("[XGridsRenderEngine] Render() LCCRender library not available.");
+                return null;
+            }
+            const settings = tileset.settings;
+            let position = settings === null || settings === void 0 ? void 0 : settings.origin;
+            if (settings.dontTransform) {
+                position = null;
+            }
+            let m1 = undefined;
+            // Location matrix.
+            if ((position === null || position === void 0 ? void 0 : position.latitude) || (position === null || position === void 0 ? void 0 : position.longitude) || (position === null || position === void 0 ? void 0 : position.altitude)) {
+                m1 = Cesium.Transforms.eastNorthUpToFixedFrame(Cesium.Cartesian3.fromDegrees(EnsureNumber(position.longitude, 0), EnsureNumber(position.latitude, 0), EnsureNumber(position.altitude, 0)));
+            }
+            else {
+                m1 = Cesium.Transforms.eastNorthUpToFixedFrame(Cesium.Cartesian3.fromDegrees(0, 0, 0));
+            }
+            // Apply HPR + scale.
+            if (!settings.dontRotate && !settings.dontTransform) {
+                const translationMatrix = Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(0, 0, 0), new Cesium.Matrix4());
+                const hpr = Cesium.HeadingPitchRoll.fromDegrees(EnsureNumber((_a = settings.rotation) === null || _a === void 0 ? void 0 : _a.z), EnsureNumber((_b = settings.rotation) === null || _b === void 0 ? void 0 : _b.x), EnsureNumber((_c = settings.rotation) === null || _c === void 0 ? void 0 : _c.y), new Cesium.HeadingPitchRoll());
+                const hprRotation = Cesium.Matrix3.fromHeadingPitchRoll(hpr);
+                const scaleMatrix = Cesium.Matrix4.fromUniformScale(EnsureNumber((position === null || position === void 0 ? void 0 : position.scale) || 1, 1), new Cesium.Matrix4());
+                let combinedMatrix = Cesium.Matrix4.multiply(m1, translationMatrix, new Cesium.Matrix4());
+                combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, Cesium.Matrix4.fromRotation(hprRotation), new Cesium.Matrix4());
+                combinedMatrix = Cesium.Matrix4.multiply(combinedMatrix, scaleMatrix, new Cesium.Matrix4());
+                m1 = combinedMatrix;
+            }
+            const loadUrl = BModels.Tileset.GetFileUrl({
+                file: tileset.rootFileName || "meta.lcc",
+                tilesetId: tileset.id,
+                viaCdn: true,
+                legacy: true,
+                cacheToken: tileset.generateVersion,
+                api: api
+            });
+            return LCCRender.load({
+                camera: viewer.camera,
+                scene: viewer.scene,
+                dataPath: loadUrl,
+                renderLib: Cesium,
+                canvas: viewer.canvas,
+                useEnv: false,
+                modelMatrix: m1,
+                useIndexDB: false,
+                appKey: null
+            });
+        }
+        XGridsRenderEngine.Render = Render;
+        function Remove(viewer, renderObject) {
+            if (!renderObject) {
+                return;
+            }
+            if (!LCCRender) {
+                console.warn("[XGridsRenderEngine] Remove() LCCRender library not available.");
+                return;
+            }
+            LCCRender.unload(renderObject);
+        }
+        XGridsRenderEngine.Remove = Remove;
+    })(exports.XGridsRenderEngine || (exports.XGridsRenderEngine = {}));
+
     async function getLegacyTileset(params) {
         const { apiGetter, menuItem, tileset } = params;
         try {
@@ -20938,6 +21004,12 @@
         }
     }
     (function (TilesetArbRenderManager) {
+        let ERenderType;
+        (function (ERenderType) {
+            ERenderType["CesiumTileset"] = "CesiumTileset";
+            ERenderType["XGridsLCC"] = "XGridsLCC";
+            ERenderType["Unknown"] = "Unknown";
+        })(ERenderType = TilesetArbRenderManager.ERenderType || (TilesetArbRenderManager.ERenderType = {}));
         class Manager {
             get Disposed() {
                 return this.disposed;
@@ -20948,6 +21020,12 @@
             get Styler() {
                 return this.styler;
             }
+            get RenderType() {
+                return this.renderType;
+            }
+            get RenderTypeChanged() {
+                return this.renderTypeChanged;
+            }
             constructor(params) {
                 this.disposed = false;
                 this.cTileset = null;
@@ -20971,6 +21049,11 @@
                 // Saves having to do a case-insensitive lookup every time.
                 this.featurePropCache = new Map();
                 this.featurePropsChecked = 0;
+                // How we're rendering the data.
+                this.renderType = ERenderType.Unknown;
+                this.renderTypeChanged = new BModels.BruceEvent();
+                // LCC object if we're using XGrids to render LCC data.
+                this.lccObject = null;
                 this.viewer = params.viewer;
                 this.getters = params.getters;
                 this.visualsManager = params.register;
@@ -21016,7 +21099,7 @@
                 }
                 const tilesetId = (_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.TilesetID;
                 (async () => {
-                    var _a, _b, _c, _d, _e, _f, _g;
+                    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
                     if (tilesetId) {
                         let canAccess = false;
                         try {
@@ -21055,113 +21138,137 @@
                     if (tileset && loadUrlOverride) {
                         tileset.loadUrl = loadUrlOverride;
                     }
-                    const LEGACY_TYPES = [
-                        BModels.Tileset.EType.LegacyEntitiesSet,
-                        BModels.Tileset.EType.LegacyExternal,
-                        BModels.Tileset.EType.LegacyStatic
-                    ];
-                    if (!type || LEGACY_TYPES.includes(type)) {
-                        // Legacy type. We re-request using ui.tileset endpoint.
-                        const legacyTileset = tileset ? await getLegacyTileset({
-                            apiGetter: this.getters.GetBruceGetter(),
-                            menuItem: this.item,
-                            tileset
-                        }) : null;
-                        if (this.disposed) {
-                            return;
-                        }
-                        let accountId = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID;
-                        if (!accountId) {
-                            accountId = this.getters.GetAccountId();
-                        }
-                        this.cTileset = await exports.TilesetRenderEngine.RenderLegacy({
-                            apiGetter: this.getters.GetBruceGetter(),
-                            tileset: legacyTileset,
-                            viewer: this.viewer,
-                            ionId: (_d = this.item.IonResource) === null || _d === void 0 ? void 0 : _d.AssetID,
-                            ionAccessToken: (_e = this.item.IonResource) === null || _e === void 0 ? void 0 : _e.AccessToken,
-                            loadUrl: loadUrlOverride,
-                            accountId: accountId,
-                            viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled),
-                            noMemoryLimit: this.item.noMaximumMemory,
-                            backFaceCulling: this.item.backFaceCulling
+                    // LCC Tileset to load through XGrids libs if they're available.
+                    if (tileset.type === BModels.Tileset.EType.LegacyStatic && tileset.rootFileName && (tileset.rootFileName.toLowerCase()).endsWith(".lcc")) {
+                        this.renderType = ERenderType.XGridsLCC;
+                        this.renderTypeChanged.Trigger(this.renderType);
+                        const api = this.getters.GetBruceApi({
+                            accountId: ((_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID) || this.getters.GetAccountId()
                         });
-                    }
-                    else if (tileset) {
-                        this.cTileset = await exports.TilesetRenderEngine.Render({
-                            apiGetter: this.getters.GetBruceGetter(),
-                            tileset: tileset,
+                        this.lccObject = exports.XGridsRenderEngine.Render({
+                            api: api,
                             viewer: this.viewer,
-                            coords: null,
-                            accountId: (_g = (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID) !== null && _g !== void 0 ? _g : this.getters.GetAccountId(),
-                            viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled)
+                            tileset: tileset
                         });
-                    }
-                    if (this.disposed) {
-                        this.doDispose();
-                        return;
-                    }
-                    this.viewer.scene.requestRender();
-                    exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(() => {
-                        if (this.disposed || this.viewer.isDestroyed()) {
+                        // Disposed while it was loading so we'll remove it now.
+                        if (this.Disposed && this.lccObject) {
+                            exports.XGridsRenderEngine.Remove(this.viewer, this.lccObject);
+                            this.lccObject = null;
                             return;
                         }
-                        // Colour mask to apply to the Tileset as a whole.
-                        // Individual Entities can override this.
-                        // This is typically used for Tilesets without Entities to allow some sort of basic styling per-bookmark.
-                        try {
-                            const colorCss = this.item.colorMask;
-                            if (colorCss) {
-                                this.cTileset.style = new Cesium.Cesium3DTileStyle({
-                                    color: {
-                                        conditions: [
-                                            ["true", `color("${colorCss}")`]
-                                        ]
-                                    }
-                                });
+                    }
+                    // Typical Cesium Tileset.
+                    else {
+                        this.renderType = ERenderType.CesiumTileset;
+                        this.renderTypeChanged.Trigger(this.renderType);
+                        const LEGACY_TYPES = [
+                            BModels.Tileset.EType.LegacyEntitiesSet,
+                            BModels.Tileset.EType.LegacyExternal,
+                            BModels.Tileset.EType.LegacyStatic
+                        ];
+                        if (!type || LEGACY_TYPES.includes(type)) {
+                            // Legacy type. We re-request using ui.tileset endpoint.
+                            const legacyTileset = tileset ? await getLegacyTileset({
+                                apiGetter: this.getters.GetBruceGetter(),
+                                menuItem: this.item,
+                                tileset
+                            }) : null;
+                            if (this.disposed) {
+                                return;
                             }
-                        }
-                        catch (e) {
-                            console.error(e);
-                        }
-                        try {
-                            if (this.item.ApplyStyles ||
-                                this.item.Type == BModels.MenuItem.EType.IonTileset) {
-                                const api = this.getters.GetBruceApi();
-                                this.styler.Init({
-                                    viewer: this.viewer,
-                                    api: api,
-                                    cTileset: this.cTileset,
-                                    fallbackStyleId: this.item.styleId,
-                                    styleMapping: this.item.StyleMapping,
-                                    expandSources: false,
-                                    menuItemId: this.item.id,
-                                    register: this.visualsManager,
-                                });
+                            let accountId = (_e = (_d = this.item) === null || _d === void 0 ? void 0 : _d.tileset) === null || _e === void 0 ? void 0 : _e.ClientAccountID;
+                            if (!accountId) {
+                                accountId = this.getters.GetAccountId();
                             }
-                            this.onCTilesetLoad();
-                            this.viewer.scene.requestRender();
-                        }
-                        catch (e) {
-                            console.error(e);
-                        }
-                    });
-                    this.cTileset.tileLoad.addEventListener((tile) => {
-                        try {
-                            this.queueTile(tile, true);
-                        }
-                        catch (e) {
-                            console.error(e);
+                            this.cTileset = await exports.TilesetRenderEngine.RenderLegacy({
+                                apiGetter: this.getters.GetBruceGetter(),
+                                tileset: legacyTileset,
+                                viewer: this.viewer,
+                                ionId: (_f = this.item.IonResource) === null || _f === void 0 ? void 0 : _f.AssetID,
+                                ionAccessToken: (_g = this.item.IonResource) === null || _g === void 0 ? void 0 : _g.AccessToken,
+                                loadUrl: loadUrlOverride,
+                                accountId: accountId,
+                                viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled),
+                                noMemoryLimit: this.item.noMaximumMemory,
+                                backFaceCulling: this.item.backFaceCulling
+                            });
                         }
-                    });
-                    this.cTileset.tileUnload.addEventListener((tile) => {
-                        try {
-                            this.queueTile(tile, false);
+                        else if (tileset) {
+                            this.cTileset = await exports.TilesetRenderEngine.Render({
+                                apiGetter: this.getters.GetBruceGetter(),
+                                tileset: tileset,
+                                viewer: this.viewer,
+                                coords: null,
+                                accountId: (_j = (_h = this.item.tileset) === null || _h === void 0 ? void 0 : _h.ClientAccountID) !== null && _j !== void 0 ? _j : this.getters.GetAccountId(),
+                                viaCdn: this.item.cdnEnabled == null ? true : Boolean(this.item.cdnEnabled)
+                            });
                         }
-                        catch (e) {
-                            console.error(e);
+                        if (this.disposed) {
+                            this.doDispose();
+                            return;
                         }
-                    });
+                        this.viewer.scene.requestRender();
+                        exports.TilesetRenderEngine.OnTilesetReady(this.cTileset).then(() => {
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return;
+                            }
+                            // Colour mask to apply to the Tileset as a whole.
+                            // Individual Entities can override this.
+                            // This is typically used for Tilesets without Entities to allow some sort of basic styling per-bookmark.
+                            try {
+                                const colorCss = this.item.colorMask;
+                                if (colorCss) {
+                                    this.cTileset.style = new Cesium.Cesium3DTileStyle({
+                                        color: {
+                                            conditions: [
+                                                ["true", `color("${colorCss}")`]
+                                            ]
+                                        }
+                                    });
+                                }
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                            try {
+                                if (this.item.ApplyStyles ||
+                                    this.item.Type == BModels.MenuItem.EType.IonTileset) {
+                                    const api = this.getters.GetBruceApi();
+                                    this.styler.Init({
+                                        viewer: this.viewer,
+                                        api: api,
+                                        cTileset: this.cTileset,
+                                        fallbackStyleId: this.item.styleId,
+                                        styleMapping: this.item.StyleMapping,
+                                        expandSources: false,
+                                        menuItemId: this.item.id,
+                                        register: this.visualsManager,
+                                    });
+                                }
+                                this.onCTilesetLoad();
+                                this.viewer.scene.requestRender();
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                        this.cTileset.tileLoad.addEventListener((tile) => {
+                            try {
+                                this.queueTile(tile, true);
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                        this.cTileset.tileUnload.addEventListener((tile) => {
+                            try {
+                                this.queueTile(tile, false);
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                    }
                 })();
             }
             /**
@@ -21305,6 +21412,10 @@
                     }
                     this.cTileset = null;
                 }
+                if (this.lccObject) {
+                    exports.XGridsRenderEngine.Remove(this.viewer, this.lccObject);
+                    this.lccObject = null;
+                }
                 (_b = this.styler) === null || _b === void 0 ? void 0 : _b.Dispose();
                 this.visualsManager.RemoveRegos({
                     menuItemId: this.item.id
@@ -34361,7 +34472,7 @@
         }
     }
 
-    const VERSION = "6.2.2";
+    const VERSION = "6.2.4";
 
     exports.VERSION = VERSION;
     exports.isOutlineChanged = isOutlineChanged;