mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-21 02:32:18 +00:00
Merge main into denis/iss-live-telemetry
Conflicts: the locale catalogs, package boundaries and format scope are three-way merges (entries main removed, such as displayPanelScroll.js, stay removed); applicationShell.js and ContextView.vue keep main's Space Missions panel and the STATION and LIVE wiring, moved back into _initGlobalContextPanel; installations take main's feedback module, and their label box joins main's card-on-top click rule; ports.test.mjs lists modelParts and modelNodes; CURRENT-STATE.md keeps both edits. zh-Hant is regenerated from zh-CN, as main now requires. "Below" keeps main's translations.
This commit is contained in:
commit
0620d01140
1526 files changed
+52168
-11320
No files matched your search
@@ -1616,8 +1616,12 @@ export function createStubRenderer(options = {}) {
|
||||
if (capabilities.has('imageryFrames')) {
|
||||
let source = null;
|
||||
let clockKind = 'scene';
|
||||
/** The time the source shows for `ms`: the nearest frame, or within the videos. */
|
||||
/** The time the source shows for `ms`: the nearest frame, within the videos, or a decoded source's slot. */
|
||||
const shownTime = (ms) => {
|
||||
if (source?.kind === 'decoded') {
|
||||
const slot = Number.isFinite(ms) ? source.slotAt(ms) : null;
|
||||
return Number.isFinite(slot) ? slot : null;
|
||||
}
|
||||
if (source?.kind === 'video') {
|
||||
let best = null;
|
||||
let bestOff = Infinity;
|
||||
@@ -1651,10 +1655,22 @@ export function createStubRenderer(options = {}) {
|
||||
deliver(listeners.frameReady, drawnTime);
|
||||
});
|
||||
layer.setFrames = (next, opts = {}) => {
|
||||
if (next.kind === 'decoded' && !capabilities.has('imageryDecoded'))
|
||||
throw new TypeError('decoded imagery needs imageryDecoded');
|
||||
if (
|
||||
next.kind === 'decoded' &&
|
||||
(typeof next.slotAt !== 'function' || typeof next.tile !== 'function')
|
||||
)
|
||||
throw new TypeError('a decoded source needs slotAt and tile');
|
||||
source =
|
||||
next.kind === 'video'
|
||||
? { kind: 'video', segments: next.segments.map((s) => ({ ...s })) }
|
||||
: { kind: 'frames', frames: next.frames.slice() };
|
||||
next.kind === 'decoded'
|
||||
? next
|
||||
: next.kind === 'video'
|
||||
? {
|
||||
kind: 'video',
|
||||
segments: next.segments.map((s) => ({ ...s })),
|
||||
}
|
||||
: { kind: 'frames', frames: next.frames.slice() };
|
||||
wanted = null;
|
||||
drawnTime = null;
|
||||
clockKind = opts.clock ?? 'scene';
|
||||
|
||||
Reference in new issue
Block a user