Enforce explicit WebGL book playback timeline
This commit is contained in:
@@ -28,6 +28,10 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
'ensureAnimationTimings',
|
||||
'createPreparedSegment',
|
||||
'createRevealDetail',
|
||||
'applyTexturePlan',
|
||||
'startRevealForSegment',
|
||||
'assertSegmentReady',
|
||||
'collectRequiredPageMetas',
|
||||
'requiresSpreadTransition',
|
||||
'requiresRightPageFlipAfterReveal',
|
||||
'getBlockRevealSides',
|
||||
@@ -103,6 +107,7 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
|
||||
await this.timeStage('activate', segment, () => this.activatePreparedSegment(segment, sentence));
|
||||
|
||||
sentence.webglRevealController = () => this.startRevealForSegment(segment);
|
||||
const visualPromise = this.waitForVisualCompletion(segment);
|
||||
const playbackPromise = this.timeStage('playback', segment, () => {
|
||||
return this.playbackCoordinator?.play?.(sentence) || Promise.resolve();
|
||||
@@ -146,7 +151,10 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
if (!previewSpread) return null;
|
||||
|
||||
const revealDetail = this.createRevealDetail(sentence, previewSpread, 'prepare');
|
||||
this.textureRenderer.prepareRevealBlock(revealDetail, { phase: 'prepare' });
|
||||
const texturePlan = this.textureRenderer.prepareRevealBlock(revealDetail, {
|
||||
phase: 'prepare',
|
||||
publishEvent: false
|
||||
});
|
||||
|
||||
const targetSpreadIndex = Math.max(0, Number(previewSpread.index || 0));
|
||||
const currentSpreadIndex = this.getVisibleSpreadIndex();
|
||||
@@ -162,11 +170,14 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
revealSides,
|
||||
requiresPreFlip: targetSpreadIndex > currentSpreadIndex,
|
||||
requiresRightFlip: revealSides.includes('right') && this.requiresRightPageFlipAfterReveal(previewSpread),
|
||||
preparedTexturePlan: texturePlan,
|
||||
preparedAt: performance.now(),
|
||||
status: 'prepared'
|
||||
};
|
||||
|
||||
this.applyTexturePlan(texturePlan, segment, 'prepare');
|
||||
await this.timeStage('texture-prewarm', segment, () => this.prewarmSegmentTextures(segment));
|
||||
await this.assertSegmentReady(segment, 'prepare');
|
||||
if (options.immediate !== true) {
|
||||
await new Promise(resolve => setTimeout(resolve, 0));
|
||||
}
|
||||
@@ -185,7 +196,12 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
&& this.requiresRightPageFlipAfterReveal(segment.activeSpread || segment.previewSpread);
|
||||
|
||||
const revealDetail = this.createRevealDetail(sentence, segment.activeSpread || segment.previewSpread, 'activate');
|
||||
this.textureRenderer.prepareRevealBlock(revealDetail);
|
||||
const texturePlan = this.textureRenderer.prepareRevealBlock(revealDetail, {
|
||||
publishEvent: false
|
||||
});
|
||||
segment.activeTexturePlan = texturePlan;
|
||||
this.applyTexturePlan(texturePlan, segment, 'activate');
|
||||
await this.assertSegmentReady(segment, 'activate');
|
||||
segment.status = 'activated';
|
||||
this.recordDiagnostic('segment-activate:end', segment);
|
||||
return segment.activeSpread;
|
||||
@@ -210,6 +226,38 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
};
|
||||
}
|
||||
|
||||
applyTexturePlan(texturePlan = null, segment = {}, phase = 'activate') {
|
||||
if (!texturePlan) {
|
||||
throw new Error(`BookPlaybackTimeline: Missing texture plan for block ${segment.blockId ?? 'unknown'} during ${phase}`);
|
||||
}
|
||||
if (typeof window.BookLabDebug?.applyPageTextureRecords !== 'function') {
|
||||
throw new Error('BookPlaybackTimeline: WebGL book lab cannot apply prepared texture plans');
|
||||
}
|
||||
window.BookLabDebug.applyPageTextureRecords({
|
||||
...texturePlan,
|
||||
phase: phase === 'prepare' ? 'prepare' : 'activate'
|
||||
});
|
||||
this.recordDiagnostic(`texture-plan-applied:${phase}`, segment);
|
||||
return true;
|
||||
}
|
||||
|
||||
startRevealForSegment(segment = {}) {
|
||||
if (!segment?.blockId) return false;
|
||||
const revealStart = this.textureRenderer?.startPreparedRevealAnimation?.(segment.blockId, {
|
||||
publishEvent: false
|
||||
});
|
||||
if (!revealStart) {
|
||||
throw new Error(`BookPlaybackTimeline: Prepared reveal animation is missing for block ${segment.blockId}`);
|
||||
}
|
||||
if (typeof window.BookLabDebug?.startRevealForBlock !== 'function') {
|
||||
throw new Error('BookPlaybackTimeline: WebGL book lab cannot start prepared reveals explicitly');
|
||||
}
|
||||
window.BookLabDebug.startRevealForBlock(segment.blockId);
|
||||
this.markBenchmark('reveal-start', segment);
|
||||
this.recordDiagnostic('reveal-started', segment);
|
||||
return true;
|
||||
}
|
||||
|
||||
requiresSpreadTransition(segment = {}) {
|
||||
return Math.max(0, Number(segment.targetSpreadIndex || 0)) > this.getVisibleSpreadIndex();
|
||||
}
|
||||
@@ -288,15 +336,20 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
getPageMetaForIndex: this.getPageMetaForIndex,
|
||||
recordMiss: true
|
||||
});
|
||||
await this.assertSegmentReady({
|
||||
blockId: options.blockId ?? null,
|
||||
targetSpreadIndex: options.targetSpread,
|
||||
revealSides: []
|
||||
}, 'flip');
|
||||
const wait = this.waitForPageFlipFinished(options.targetSpread);
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:request-page-flip', {
|
||||
detail: {
|
||||
direction,
|
||||
force: options.force === true,
|
||||
reason: options.reason || 'timeline',
|
||||
targetSpread: options.targetSpread
|
||||
}
|
||||
}));
|
||||
if (typeof window.BookLabDebug?.requestPageFlip !== 'function') {
|
||||
throw new Error('BookPlaybackTimeline: WebGL book lab cannot execute prepared flip plans');
|
||||
}
|
||||
window.BookLabDebug.requestPageFlip(direction, {
|
||||
force: options.force === true,
|
||||
reason: options.reason || 'timeline',
|
||||
targetSpread: options.targetSpread
|
||||
});
|
||||
return wait;
|
||||
}
|
||||
|
||||
@@ -316,6 +369,53 @@ class BookPlaybackTimelineModule extends BaseModule {
|
||||
return result;
|
||||
}
|
||||
|
||||
collectRequiredPageMetas(segment = {}) {
|
||||
const spreads = new Set();
|
||||
const currentSpread = this.getVisibleSpreadIndex();
|
||||
const targetSpread = Number.isFinite(Number(segment.targetSpreadIndex))
|
||||
? Math.max(0, Math.round(Number(segment.targetSpreadIndex)))
|
||||
: currentSpread;
|
||||
spreads.add(0);
|
||||
spreads.add(currentSpread);
|
||||
spreads.add(Math.max(0, currentSpread - 1));
|
||||
spreads.add(currentSpread + 1);
|
||||
spreads.add(targetSpread);
|
||||
if (segment.requiresRightFlip) spreads.add(targetSpread + 1);
|
||||
return Array.from(spreads)
|
||||
.filter(spread => spread >= 0)
|
||||
.flatMap(spread => [
|
||||
this.getPageMetaForIndex(spread * 2),
|
||||
this.getPageMetaForIndex(spread * 2 + 1)
|
||||
]);
|
||||
}
|
||||
|
||||
async assertSegmentReady(segment = {}, phase = 'play') {
|
||||
if (!this.pageCache || typeof this.pageCache.ensurePageTexture !== 'function') {
|
||||
throw new Error('BookPlaybackTimeline: Page texture cache is not available');
|
||||
}
|
||||
const metas = this.collectRequiredPageMetas(segment);
|
||||
const missing = [];
|
||||
await Promise.all(metas.map(async (meta) => {
|
||||
const texture = await this.pageCache.ensurePageTexture(meta, {
|
||||
recordMiss: true
|
||||
});
|
||||
if (!texture) missing.push(meta);
|
||||
}));
|
||||
if (missing.length > 0) {
|
||||
this.pageCache.recordProblem?.({
|
||||
type: 'timeline-cache-readiness-failed',
|
||||
phase,
|
||||
blockId: segment.blockId ?? null,
|
||||
missingPages: missing.map(meta => meta.pageIndex ?? null)
|
||||
});
|
||||
throw new Error(`BookPlaybackTimeline: Cache readiness failed during ${phase} for pages ${missing.map(meta => meta.pageIndex).join(', ')}`);
|
||||
}
|
||||
segment.cacheReady = true;
|
||||
segment.cacheReadyPhase = phase;
|
||||
this.recordDiagnostic(`cache-ready:${phase}`, segment);
|
||||
return true;
|
||||
}
|
||||
|
||||
getPageMetaForIndex(pageIndex = 0) {
|
||||
const index = Math.max(0, Math.round(Number(pageIndex || 0)));
|
||||
const spreadIndex = Math.floor(index / 2);
|
||||
|
||||
@@ -79,7 +79,6 @@ class BookTextureRendererModule extends BaseModule {
|
||||
'prepareRevealBlock',
|
||||
'preloadAdditionalRevealSpreads',
|
||||
'spreadContainsBlock',
|
||||
'hasPreparedRevealBlock',
|
||||
'createAnimationState',
|
||||
'getDrawPhase',
|
||||
'publishPreparedReveal',
|
||||
@@ -141,12 +140,6 @@ class BookTextureRendererModule extends BaseModule {
|
||||
}
|
||||
this.drawSpread(this.currentSpread);
|
||||
});
|
||||
this.addEventListener(document, 'book-texture:reveal-block', (event) => {
|
||||
this.startRevealAnimation(event.detail || {});
|
||||
});
|
||||
this.addEventListener(document, 'book-texture:prepare-reveal-block', (event) => {
|
||||
this.prepareRevealBlock(event.detail || {});
|
||||
});
|
||||
this.addEventListener(document, 'book-texture:fast-forward', this.fastForwardAnimations);
|
||||
this.addEventListener(document, 'ui:command', (event) => {
|
||||
if (event.detail?.type === 'continue') this.fastForwardAnimations();
|
||||
@@ -910,13 +903,17 @@ class BookTextureRendererModule extends BaseModule {
|
||||
const cached = this.pageCache.takePreparedRevealPlan(id);
|
||||
this.activeAnimations.set(id, this.createAnimationState(blockId, wordTimings, detail));
|
||||
this.pendingRevealBlockIds.delete(id);
|
||||
this.publishPreparedReveal(cached);
|
||||
this.publishPreparedReveal(cached, options);
|
||||
this.markPipelineTiming('prepareRevealBlock:end', {
|
||||
blockId: id,
|
||||
wordTimingCount: wordTimings.length,
|
||||
reusedPreparedCanvas: true
|
||||
});
|
||||
return;
|
||||
return {
|
||||
...cached,
|
||||
phase: 'activate',
|
||||
preparedFromCache: true
|
||||
};
|
||||
}
|
||||
|
||||
this.activeAnimations.set(id, this.createAnimationState(blockId, wordTimings, detail));
|
||||
@@ -924,7 +921,10 @@ class BookTextureRendererModule extends BaseModule {
|
||||
this.revealPublishBlockIds = new Set([id]);
|
||||
const spread = detail.spread || this.currentSpread || this.pagination?.getCurrentSpread?.();
|
||||
const sides = ['left', 'right'];
|
||||
const published = this.drawSpread(spread, sides, { phase });
|
||||
const published = this.drawSpread(spread, sides, {
|
||||
phase,
|
||||
publishEvent: options.publishEvent !== false
|
||||
});
|
||||
if (phase !== 'prepare') this.preloadAdditionalRevealSpreads(id, spread);
|
||||
if (phase === 'prepare' && published) {
|
||||
this.pageCache?.rememberPreparedRevealPlan?.(id, {
|
||||
@@ -939,6 +939,12 @@ class BookTextureRendererModule extends BaseModule {
|
||||
wordTimingCount: wordTimings.length,
|
||||
phase
|
||||
});
|
||||
return published ? {
|
||||
...published,
|
||||
blockId,
|
||||
wordTimings,
|
||||
totalDuration: detail.totalDuration || 0
|
||||
} : null;
|
||||
}
|
||||
|
||||
preloadAdditionalRevealSpreads(blockId, primarySpread = null) {
|
||||
@@ -960,32 +966,29 @@ class BookTextureRendererModule extends BaseModule {
|
||||
});
|
||||
}
|
||||
|
||||
hasPreparedRevealBlock(blockId) {
|
||||
const id = String(blockId ?? '');
|
||||
return Boolean(id && this.pageCache?.hasPreparedRevealPlan?.(id));
|
||||
}
|
||||
|
||||
publishPreparedReveal(prepared) {
|
||||
if (!prepared) return;
|
||||
publishPreparedReveal(prepared, options = {}) {
|
||||
if (!prepared) return null;
|
||||
this.markPipelineTiming('publishPreparedReveal', {
|
||||
blockId: prepared.blockId,
|
||||
sides: prepared.sides || [],
|
||||
hasReveal: Boolean(prepared.reveal && Object.keys(prepared.reveal).length)
|
||||
});
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-texture-records', {
|
||||
detail: {
|
||||
metrics: prepared.metrics,
|
||||
hitMaps: prepared.hitMaps || this.hitMaps,
|
||||
records: prepared.records || this.buildPageTextureRecords(prepared.sides || ['left', 'right'], prepared),
|
||||
reveal: prepared.reveal || {},
|
||||
pageMeta: prepared.pageMeta || {},
|
||||
phase: 'activate',
|
||||
preparedFromCache: true
|
||||
}
|
||||
}));
|
||||
const detail = {
|
||||
metrics: prepared.metrics,
|
||||
hitMaps: prepared.hitMaps || this.hitMaps,
|
||||
records: prepared.records || this.buildPageTextureRecords(prepared.sides || ['left', 'right'], prepared),
|
||||
reveal: prepared.reveal || {},
|
||||
pageMeta: prepared.pageMeta || {},
|
||||
phase: 'activate',
|
||||
preparedFromCache: true
|
||||
};
|
||||
if (options.publishEvent !== false) {
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-texture-records', { detail }));
|
||||
}
|
||||
return detail;
|
||||
}
|
||||
|
||||
startPreparedRevealAnimation(blockId) {
|
||||
startPreparedRevealAnimation(blockId, options = {}) {
|
||||
const id = String(blockId ?? '');
|
||||
const animation = this.activeAnimations.get(id);
|
||||
if (!animation) return false;
|
||||
@@ -996,13 +999,18 @@ class BookTextureRendererModule extends BaseModule {
|
||||
animation.startedAt = performance.now();
|
||||
animation.prepared = false;
|
||||
animation.completed = false;
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-reveal-start', {
|
||||
detail: {
|
||||
blockId: animation.blockId
|
||||
}
|
||||
}));
|
||||
if (options.publishEvent !== false) {
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-reveal-start', {
|
||||
detail: {
|
||||
blockId: animation.blockId
|
||||
}
|
||||
}));
|
||||
}
|
||||
this.requestAnimationFrame();
|
||||
return true;
|
||||
return {
|
||||
blockId: animation.blockId,
|
||||
wordTimingCount: Array.isArray(animation.wordTimings) ? animation.wordTimings.length : 0
|
||||
};
|
||||
}
|
||||
|
||||
fastForwardAnimations() {
|
||||
@@ -1153,9 +1161,11 @@ class BookTextureRendererModule extends BaseModule {
|
||||
regionCounts,
|
||||
phase
|
||||
});
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-texture-records', {
|
||||
detail
|
||||
}));
|
||||
if (options.publishEvent !== false) {
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:page-texture-records', {
|
||||
detail
|
||||
}));
|
||||
}
|
||||
return detail;
|
||||
}
|
||||
|
||||
|
||||
@@ -252,16 +252,6 @@ class PlaybackCoordinatorModule extends BaseModule {
|
||||
};
|
||||
});
|
||||
}
|
||||
document.dispatchEvent(new CustomEvent('book-texture:reveal-block', {
|
||||
detail: {
|
||||
id: sentence.id,
|
||||
blockId: sentence.blockId ?? sentence.metadata?.blockId ?? null,
|
||||
wordTimings,
|
||||
cueTimings,
|
||||
totalDuration: sentence.animation.totalDuration || 0
|
||||
}
|
||||
}));
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const totalDuration = wordTimings.length > 0
|
||||
? Math.max(...wordTimings.map(timing => timing.delay + timing.duration))
|
||||
@@ -332,15 +322,16 @@ class PlaybackCoordinatorModule extends BaseModule {
|
||||
cueTimings = [];
|
||||
}
|
||||
|
||||
document.dispatchEvent(new CustomEvent('book-texture:reveal-block', {
|
||||
detail: {
|
||||
id: sentence.id,
|
||||
blockId: sentence.blockId ?? sentence.metadata?.blockId ?? null,
|
||||
wordTimings,
|
||||
cueTimings,
|
||||
totalDuration: sentence.animation?.totalDuration || 0
|
||||
}
|
||||
}));
|
||||
if (typeof sentence.webglRevealController !== 'function') {
|
||||
throw new Error('PlaybackCoordinator: WebGL playback requires a prepared timeline reveal controller');
|
||||
}
|
||||
sentence.webglRevealController({
|
||||
id: sentence.id,
|
||||
blockId: sentence.blockId ?? sentence.metadata?.blockId ?? null,
|
||||
wordTimings,
|
||||
cueTimings,
|
||||
totalDuration: sentence.animation?.totalDuration || 0
|
||||
});
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const totalDuration = wordTimings.length > 0
|
||||
|
||||
@@ -899,39 +899,9 @@ class SentenceQueueModule extends BaseModule {
|
||||
const blockId = sentence.blockId ?? sentence.metadata?.blockId ?? null;
|
||||
if (blockId == null) return null;
|
||||
const bookPlaybackTimeline = this.getModule('book-playback-timeline');
|
||||
if (bookPlaybackTimeline && typeof bookPlaybackTimeline.prepareSentence === 'function') {
|
||||
if (!options.immediate) {
|
||||
await new Promise(resolve => {
|
||||
const scheduler = window.requestIdleCallback || ((callback) => window.setTimeout(callback, 1));
|
||||
scheduler(() => resolve(), { timeout: 80 });
|
||||
});
|
||||
}
|
||||
if (options.queueGeneration !== undefined && options.queueGeneration !== this.queueGeneration) return null;
|
||||
const segment = await bookPlaybackTimeline.prepareSentence(sentence, {
|
||||
immediate: options.immediate === true
|
||||
});
|
||||
if (!segment) return null;
|
||||
sentence.webglBookPresentation = {
|
||||
prepared: true,
|
||||
blockId,
|
||||
spread: segment.previewSpread || segment.activeSpread || null,
|
||||
timelineSegment: segment
|
||||
};
|
||||
return sentence.webglBookPresentation.spread;
|
||||
if (!bookPlaybackTimeline || typeof bookPlaybackTimeline.prepareSentence !== 'function') {
|
||||
throw new Error('SentenceQueue: 3D book presentation requires the book playback timeline');
|
||||
}
|
||||
const bookPagination = this.getModule('book-pagination');
|
||||
const bookTextureRenderer = this.getModule('book-texture-renderer');
|
||||
if (!bookPagination || !bookTextureRenderer) return null;
|
||||
|
||||
if (this.isWebGLBookPresentationPrepared(sentence)) {
|
||||
return sentence.webglBookPresentation?.spread || null;
|
||||
}
|
||||
|
||||
if (!Array.isArray(sentence.animation?.wordTimings) || sentence.animation.wordTimings.length === 0) {
|
||||
const words = String(sentence.layoutText || sentence.text || '').match(/\S+/g) || [];
|
||||
sentence.animation = this.calculateAnimationTiming(words, sentence.tts?.duration || 0, sentence.cueMarkers || []);
|
||||
}
|
||||
|
||||
if (!options.immediate) {
|
||||
await new Promise(resolve => {
|
||||
const scheduler = window.requestIdleCallback || ((callback) => window.setTimeout(callback, 1));
|
||||
@@ -939,42 +909,25 @@ class SentenceQueueModule extends BaseModule {
|
||||
});
|
||||
}
|
||||
if (options.queueGeneration !== undefined && options.queueGeneration !== this.queueGeneration) return null;
|
||||
|
||||
const spread = typeof bookPagination.preparePendingBlock === 'function'
|
||||
? await bookPagination.preparePendingBlock(sentence, {
|
||||
activate: false,
|
||||
publish: false,
|
||||
includeUnrenderedHistory: true
|
||||
})
|
||||
: null;
|
||||
if (!spread) return null;
|
||||
if (options.queueGeneration !== undefined && options.queueGeneration !== this.queueGeneration) return null;
|
||||
|
||||
if (typeof bookTextureRenderer.prepareRevealBlock === 'function') {
|
||||
bookTextureRenderer.prepareRevealBlock({
|
||||
id: sentence.id,
|
||||
blockId,
|
||||
wordTimings: sentence.animation?.wordTimings || [],
|
||||
cueTimings: sentence.animation?.cueTimings || [],
|
||||
totalDuration: sentence.animation?.totalDuration || 0,
|
||||
spread,
|
||||
phase: 'prepare'
|
||||
}, { phase: 'prepare' });
|
||||
sentence.webglBookPresentation = {
|
||||
prepared: true,
|
||||
blockId,
|
||||
spread
|
||||
};
|
||||
}
|
||||
return spread;
|
||||
const segment = await bookPlaybackTimeline.prepareSentence(sentence, {
|
||||
immediate: options.immediate === true
|
||||
});
|
||||
if (!segment) return null;
|
||||
sentence.webglBookPresentation = {
|
||||
prepared: true,
|
||||
blockId,
|
||||
spread: segment.previewSpread || segment.activeSpread || null,
|
||||
timelineSegment: segment
|
||||
};
|
||||
return sentence.webglBookPresentation.spread;
|
||||
}
|
||||
|
||||
isWebGLBookPresentationPrepared(sentence) {
|
||||
const blockId = sentence?.blockId ?? sentence?.metadata?.blockId ?? null;
|
||||
if (blockId == null) return false;
|
||||
if (sentence?.webglBookPresentation?.prepared === true) return true;
|
||||
const bookTextureRenderer = this.getModule('book-texture-renderer');
|
||||
return Boolean(bookTextureRenderer?.hasPreparedRevealBlock?.(blockId));
|
||||
const bookPlaybackTimeline = this.getModule('book-playback-timeline');
|
||||
return Boolean(bookPlaybackTimeline?.preparedSegments?.has?.(`${sentence.gameId || sentence.metadata?.gameId || 'game'}:${blockId}`));
|
||||
}
|
||||
|
||||
isCurrentQueueItem(item, queueGeneration = this.queueGeneration) {
|
||||
|
||||
@@ -71,7 +71,6 @@ class UIDisplayHandlerModule extends BaseModule {
|
||||
'isWebGLMode',
|
||||
'playWebGLBookSentence',
|
||||
'prepareWebGLBookReveal',
|
||||
'waitForWebGLPageFlip',
|
||||
'renderStoryBlock',
|
||||
'prepareRenderableBlock',
|
||||
'prepareTextRenderable',
|
||||
@@ -1070,47 +1069,6 @@ class UIDisplayHandlerModule extends BaseModule {
|
||||
return timeline.prepareSentence(sentence, { immediate: true });
|
||||
}
|
||||
|
||||
waitForWebGLPageFlip(detail = {}) {
|
||||
return new Promise((resolve) => {
|
||||
let resolved = false;
|
||||
const cleanup = () => {
|
||||
window.clearTimeout(timeout);
|
||||
document.removeEventListener('webgl-book:page-flip-started', onStarted);
|
||||
document.removeEventListener('webgl-book:page-flip-finished', onFinished);
|
||||
};
|
||||
const finish = (result) => {
|
||||
if (resolved) return;
|
||||
resolved = true;
|
||||
cleanup();
|
||||
resolve(result);
|
||||
};
|
||||
const requestedTargetSpread = Number.isFinite(Number(detail.targetSpread))
|
||||
? Math.max(0, Math.round(Number(detail.targetSpread)))
|
||||
: null;
|
||||
const matchesTarget = (eventDetail = {}) => requestedTargetSpread == null
|
||||
|| Math.max(0, Math.round(Number(eventDetail.targetSpread || 0))) === requestedTargetSpread;
|
||||
const onStarted = (event) => {
|
||||
if (!matchesTarget(event.detail || {})) return;
|
||||
document.documentElement.dataset.webglLastStartedPageFlip = JSON.stringify(event.detail || {});
|
||||
};
|
||||
const onFinished = (event) => {
|
||||
if (!matchesTarget(event.detail || {})) return;
|
||||
finish(true);
|
||||
};
|
||||
const timeout = window.setTimeout(() => finish(false), 2400);
|
||||
document.addEventListener('webgl-book:page-flip-started', onStarted);
|
||||
document.addEventListener('webgl-book:page-flip-finished', onFinished);
|
||||
document.dispatchEvent(new CustomEvent('webgl-book:request-page-flip', {
|
||||
detail: {
|
||||
direction: Math.sign(Number(detail.direction || 1)) || 1,
|
||||
reason: detail.reason || 'pending-block-overflow',
|
||||
force: true,
|
||||
targetSpread: requestedTargetSpread
|
||||
}
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
async rerenderStory() {
|
||||
if (!this.paragraphContainer || this.renderedItems.length === 0) return;
|
||||
console.log('UIDisplayHandler: Re-typesetting story after page resize');
|
||||
|
||||
+11
-11
@@ -586,6 +586,17 @@ window.BookLabDebug = {
|
||||
window.BookTextureRenderer?.publishSpread?.();
|
||||
return true;
|
||||
},
|
||||
applyPageTextureRecords(detail = {}) {
|
||||
handlePageTextureRecords({ detail });
|
||||
return true;
|
||||
},
|
||||
startRevealForBlock(blockId) {
|
||||
startPageRevealForBlock(blockId);
|
||||
return true;
|
||||
},
|
||||
requestPageFlip(direction = 1, options = {}) {
|
||||
return startPageFlip(direction, options);
|
||||
},
|
||||
getRevealDebugState() {
|
||||
return getRevealDebugState();
|
||||
},
|
||||
@@ -686,17 +697,6 @@ document.addEventListener('webgl-book:page-reserve-directive', (event) => {
|
||||
: Math.round(value);
|
||||
setPageReserve(nextReserve);
|
||||
});
|
||||
document.addEventListener('webgl-book:request-page-flip', (event) => {
|
||||
const detail = event.detail || {};
|
||||
const direction = Math.sign(Number(detail.direction || 1)) || 1;
|
||||
const targetSpread = Number.isFinite(Number(detail.targetSpread))
|
||||
? Math.max(0, Math.round(Number(detail.targetSpread)))
|
||||
: null;
|
||||
startPageFlip(direction, {
|
||||
force: detail.force === true,
|
||||
targetSpread
|
||||
});
|
||||
});
|
||||
document.addEventListener('ui:command', (event) => {
|
||||
if (event.detail?.type === 'continue' && pendingRightPageFlip) {
|
||||
tryStartPendingRightPageFlip('continue', { force: true });
|
||||
|
||||
Reference in New Issue
Block a user