mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Wire Context into the shell
The shell connects the layer store that Context and the omnibar share, installs the click-to-Context bridge and removes both on dispose. Voice sessions hand their command runner to the same store, and the stylesheet imports the Context styles. Co-authored-by: Sameh Khamis <[email protected]>
This commit is contained in:
1 parent
0fe6fd2bb8
commit
c351e66af9
4 files changed
+64
No files matched your search
@@ -71,6 +71,8 @@ import { useHudStore } from './stores/hud.js';
|
||||
import { useDisplayStore } from './stores/display.js';
|
||||
import { useLocaleStore } from './stores/locale.js';
|
||||
import { useLocationStore } from './stores/location.js';
|
||||
import { useOmnibarStore } from './stores/omnibar.js';
|
||||
import { installEntityContext } from './entityContextBridge.js';
|
||||
import { installRailEdgeScroll } from './railEdgeScroll.js';
|
||||
import { useCockpitStore } from './stores/cockpit.js';
|
||||
import { useGlobeActionsStore } from './stores/globeActions.js';
|
||||
@@ -171,6 +173,12 @@ export class StyleManager extends ShellFacade {
|
||||
});
|
||||
// Vue views share this runtime and its stores; dispose unmounts them.
|
||||
this._ui = createUiRuntime({ pinia: applicationPinia() });
|
||||
// The omnibar and Context list and toggle data layers through the shell.
|
||||
useOmnibarStore(applicationPinia()).connect({
|
||||
layers: () => this._dataManager?.getAll?.() || [],
|
||||
setLayer: (id, enabled) =>
|
||||
this._dataManager?.setEnabled(id, enabled, { origin: 'user' }),
|
||||
});
|
||||
// Scrolling at a screen edge steps through that side's rail panels.
|
||||
this._removeRailEdgeScroll = installRailEdgeScroll();
|
||||
this._feedback = new ShellFeedback({
|
||||
@@ -184,6 +192,12 @@ export class StyleManager extends ShellFacade {
|
||||
this._updateGlobalLoadingFeedback(),
|
||||
);
|
||||
this.viewer = viewer;
|
||||
// A click on anything a layer can identify opens its card in Context.
|
||||
this._removeEntityContext = installEntityContext({
|
||||
viewer,
|
||||
getDataManager: () => this._dataManager,
|
||||
pinia: applicationPinia(),
|
||||
});
|
||||
this.mapStackController = mapStackController;
|
||||
this.placeSearch = placeSearch;
|
||||
|
||||
@@ -1879,7 +1893,9 @@ export class StyleManager extends ShellFacade {
|
||||
const { destroyTrackedReadout, destroyWorldOverlay, destroyDetection } =
|
||||
this.services;
|
||||
if (this._disposed) return;
|
||||
useOmnibarStore(applicationPinia()).connect(null);
|
||||
this._removeRailEdgeScroll?.();
|
||||
this._removeEntityContext?.();
|
||||
this._shareRestoration.destroy();
|
||||
this._feedback.clearLoadingStatus();
|
||||
this._disposed = true;
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import { defineStore } from 'pinia';
|
||||
import { markRaw, shallowRef } from 'vue';
|
||||
|
||||
/**
|
||||
* The top-bar omnibar's link to the shell. The shell connects the actions
|
||||
* the omnibar offers: `layers()` lists the data layers as `{id, name,
|
||||
* enabled}`, and `setLayer(id, enabled)` turns one on or off as a user click
|
||||
* would. Place search runs through the location controls and Ask GEV through
|
||||
* the voice controls, so neither is repeated here.
|
||||
*/
|
||||
export const useOmnibarStore = defineStore('gev-omnibar', () => {
|
||||
/** `{layers(), setLayer(id, enabled)}`, or null while disconnected. */
|
||||
const controls = shallowRef(null);
|
||||
|
||||
/** @param {?object} next The shell's omnibar actions, or null. */
|
||||
function connect(next) {
|
||||
controls.value = next && markRaw(next);
|
||||
}
|
||||
|
||||
/**
|
||||
* The voice action runner, `(name, args) → Promise<result>`: the same
|
||||
* actions voice and chat call, run directly without a model. Null while no
|
||||
* voice runtime is up.
|
||||
*/
|
||||
const runner = shallowRef(null);
|
||||
|
||||
/** @param {?Function} next The runner, or null to disconnect. */
|
||||
function connectRunner(next) {
|
||||
runner.value = next ? markRaw(next) : null;
|
||||
}
|
||||
|
||||
return { controls, connect, runner, connectRunner };
|
||||
});
|
||||
Reference in new issue
Block a user