mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Hold the shell's inputs between two engines instead of reaching released controllers
A visual choice made while no globe is attached (a style key, a Display control, a voice command) is queued and applied to the next engine's settings after it restored the address's view, so the person's choice wins; reads answer from the released settings. The globe reset and a location lookup started without a globe do nothing, and the map-source chips and camera buttons are unbound until the next globe binds them.
This commit is contained in:
1 parent
df73c5b21a
commit
40a81c58e6
7 files changed
+193
-5
No files matched your search
@@ -135,11 +135,16 @@ export class LocationNavigation {
|
||||
isCurrent: (generation) =>
|
||||
!this._disposed && generation === this._navigationGeneration,
|
||||
beforeFly: (generation) => this._reassertNavigationHandoff(generation),
|
||||
// The engine the lookup ends on: an answer that lands after a switch
|
||||
// flies the globe shown then; one started with none attached is
|
||||
// cancelled.
|
||||
search: (query, options) =>
|
||||
searchAndFlyTo(this.engine, query, {
|
||||
placeSearch: this.placeSearch,
|
||||
...options,
|
||||
}),
|
||||
this.engine
|
||||
? searchAndFlyTo(this.engine, query, {
|
||||
placeSearch: this.placeSearch,
|
||||
...options,
|
||||
})
|
||||
: Promise.resolve({ cancelled: true }),
|
||||
onResult: (destination) => {
|
||||
if (destination.outlineUnavailable)
|
||||
this._showToast(t('Detailed outline unavailable'));
|
||||
@@ -334,7 +339,9 @@ export class LocationNavigation {
|
||||
militaryAwarenessLayer,
|
||||
rocketLaunchesLayer,
|
||||
} = this.services;
|
||||
if (this._disposed)
|
||||
// Between two globe engines there is no camera to reset: nothing moves
|
||||
// and no navigation is stamped.
|
||||
if (this._disposed || !this.engine)
|
||||
return Promise.resolve({
|
||||
ok: false,
|
||||
action: 'zoom_to_globe',
|
||||
|
||||
Reference in new issue
Block a user