mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Keep authored scene playback, pack media and geographic interactions across globes
This commit is contained in:
1 parent
a49671a391
commit
160e445677
18 files changed
+959
-101
No files matched your search
@@ -52,8 +52,8 @@ test('the scene constructs the engine with the viewer and returns it beside the
|
||||
assert.ok(engineAt > viewerTeardown, 'engine teardown must precede viewer');
|
||||
assert.match(scene, /tilesetRef\.current = tileset;/);
|
||||
assert.match(
|
||||
scene,
|
||||
/return \{ viewer, engine, tileset, mapStackController, operations \};/,
|
||||
scene.replace(/\s+/g, ' '),
|
||||
/return \{ viewer, engine, tileset, mapStackController, operations, packRenderer,? \};/,
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
@@ -310,9 +310,22 @@ export async function createNavaraScene({
|
||||
engine,
|
||||
(credits ?? DATA_CREDITS).filter(({ key }) => NAVARA_CREDIT_KEYS.has(key)),
|
||||
);
|
||||
let packRenderer;
|
||||
const { createNavaraPackRenderer } =
|
||||
await import('../scenes/dataPacks/navara.js');
|
||||
const packGraphics = () =>
|
||||
(packRenderer ??= createNavaraPackRenderer(
|
||||
engine,
|
||||
navaraViews.get(engine),
|
||||
));
|
||||
return {
|
||||
viewer: null,
|
||||
engine,
|
||||
packRenderer: {
|
||||
geometry: (...args) => packGraphics().geometry(...args),
|
||||
image: (...args) => packGraphics().image(...args),
|
||||
media: (...args) => packGraphics().media(...args),
|
||||
},
|
||||
tileset: null,
|
||||
suspend() {
|
||||
uninstallRenderGovernor(engine);
|
||||
|
||||
+9
-2
@@ -54,7 +54,7 @@ export async function createApplicationScene({
|
||||
signal,
|
||||
...resources,
|
||||
});
|
||||
const { viewer, engine, tileset, mapStackController } = rendererCache
|
||||
const { viewer, engine, tileset, mapStackController, packRenderer } = rendererCache
|
||||
? await rendererCache.acquire(options.engineKind, build, defer)
|
||||
: await build({ defer });
|
||||
if (layerSession) {
|
||||
@@ -65,7 +65,14 @@ export async function createApplicationScene({
|
||||
mapStackController.getActiveId() === 'photoreal',
|
||||
);
|
||||
}
|
||||
return { viewer, engine, tileset, mapStackController, operations };
|
||||
return {
|
||||
viewer,
|
||||
engine,
|
||||
tileset,
|
||||
mapStackController,
|
||||
operations,
|
||||
packRenderer,
|
||||
};
|
||||
}
|
||||
|
||||
async function createRenderer({
|
||||
|
||||
+21
-6
@@ -35,22 +35,37 @@ export function createApplicationTools({
|
||||
startChrome,
|
||||
onSceneDirector,
|
||||
sceneDataPacks,
|
||||
layerSession,
|
||||
signal,
|
||||
defer,
|
||||
}) {
|
||||
const { viewer, engine, tileset, mapStackController, operations } = scene;
|
||||
const { styleManager, weatherEffects, cockpitCloudEffects } = controls;
|
||||
const { dataManager } = data;
|
||||
const sceneDirector = new SceneDirector(viewer, styleManager, dataManager, {
|
||||
engine,
|
||||
dataPacks: sceneDataPacks,
|
||||
isMapStackAvailable: (id) =>
|
||||
mapStackController?.isStackAvailable(id) === true,
|
||||
const isMapStackAvailable = id => mapStackController?.isStackAvailable(id) === true;
|
||||
const sceneDirector = layerSession?.director ?? new SceneDirector(viewer, styleManager, dataManager, {
|
||||
engine, dataPacks: {...sceneDataPacks,native:scene.packRenderer}, isMapStackAvailable,
|
||||
});
|
||||
if (layerSession?.director)
|
||||
sceneDirector.attachScene(
|
||||
viewer,
|
||||
engine,
|
||||
styleManager,
|
||||
scene.packRenderer,
|
||||
isMapStackAvailable,
|
||||
);
|
||||
if (layerSession) layerSession.director = sceneDirector;
|
||||
dataManager.layers
|
||||
.get('bhote-koshi-2026')
|
||||
?.module.attachSceneController(sceneDirector);
|
||||
defer(() => sceneDirector.destroy());
|
||||
defer(() => {
|
||||
if (layerSession?.handoffLayers && !layerSession.lifetime.signal.aborted) {
|
||||
sceneDirector.suspendScene();
|
||||
} else {
|
||||
if (layerSession) layerSession.director = null;
|
||||
return sceneDirector.destroy();
|
||||
}
|
||||
});
|
||||
onSceneDirector?.(sceneDirector);
|
||||
// Without a viewer (the Navara mode) the tools load with that mode's code.
|
||||
if (!viewer) {
|
||||
|
||||
Reference in new issue
Block a user