From 1d403e61704afa592c4db2f46249b10625050f45 Mon Sep 17 00:00:00 2001 From: Akirami <66513481+A-kirami@users.noreply.github.com> Date: Mon, 9 Nov 2026 14:24:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(webgal):=20seek-animation=20=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E8=BF=94=E5=9B=9E=E7=94=9F=E6=95=88=E5=8F=98=E6=8D=A2?= =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E5=87=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2 动画的预览拖拽需要引擎在时刻 T 实际应用的 target 变换与本次使用的 基准状态:编辑器不能自行复刻 relative / inherit / relativeCalc 的合成。 seekAnimationPreview 已经算出这两份值,直接随命令响应返回。 响应仍是 preview.command.seek-animation 的 envelope,payload 增加 transform / baseTransform;旧客户端忽略未知字段,请求字段不变。 --- .../Core/util/syncWithEditor/previewSyncRuntime.ts | 3 +-- .../syncWithEditor/runtime/previewSeekAnimation.ts | 8 ++++++-- packages/webgal/src/types/editorPreviewProtocol.ts | 14 +++++++++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/webgal/src/Core/util/syncWithEditor/previewSyncRuntime.ts b/packages/webgal/src/Core/util/syncWithEditor/previewSyncRuntime.ts index 1c0d759ed..210bb856a 100644 --- a/packages/webgal/src/Core/util/syncWithEditor/previewSyncRuntime.ts +++ b/packages/webgal/src/Core/util/syncWithEditor/previewSyncRuntime.ts @@ -447,8 +447,7 @@ export const startPreviewSyncRuntime = () => { return {}; }, 'preview.command.seek-animation': (payload: SeekAnimationPayload) => { - seekAnimationPreview(payload, targetTransformBaselines.getReadyTransformBaselineOverride(payload.target)); - return {}; + return seekAnimationPreview(payload, targetTransformBaselines.getReadyTransformBaselineOverride(payload.target)); }, }; diff --git a/packages/webgal/src/Core/util/syncWithEditor/runtime/previewSeekAnimation.ts b/packages/webgal/src/Core/util/syncWithEditor/runtime/previewSeekAnimation.ts index d0721aab1..9ad1cdc7e 100644 --- a/packages/webgal/src/Core/util/syncWithEditor/runtime/previewSeekAnimation.ts +++ b/packages/webgal/src/Core/util/syncWithEditor/runtime/previewSeekAnimation.ts @@ -9,18 +9,21 @@ import { buildAnimationTracks } from '@/Core/Modules/animationTracks'; import { sampleTrack } from '@/Core/controller/stage/pixi/animations/timeline'; import { applyStageEffectToTarget } from '@/Core/controller/stage/pixi/syncPixiStageState'; import type { ITransform } from '@/Core/Modules/stage/stageInterface'; -import type { SeekAnimationPayload } from '@/types/editorPreviewProtocol'; +import type { SeekAnimationPayload, SeekAnimationResponsePayload } from '@/types/editorPreviewProtocol'; /** * 把动画在 time 时刻的状态写入目标,供编辑器拖动时间轴时预览;结果只写入容器,不写入舞台状态。 * 基准状态依次取:编辑器给出的 baseTransform、目标语句执行前的基线(编辑场景中的动画语句时, * 预览已执行完这条语句,演算状态是动画的终态)、演算状态中目标的变换 * @param baselineOverride 目标语句执行前目标的变换,见 targetTransformBaseline + * + * 返回本次生效的变换与基准状态:编辑器的预览浮层需要它们来画框并反算关键帧, + * 不能自行复刻 relative / inherit / relativeCalc 的合成。 */ export function seekAnimationPreview( { target, animation, time, baseTransform: previewBase }: SeekAnimationPayload, baselineOverride?: ITransform, -) { +): SeekAnimationResponsePayload { const targetEffect = stageStateManager.getCalculationStageState().effects.find((e) => e.target === target); const base = merge(cloneDeep(baseTransform), previewBase ?? baselineOverride ?? targetEffect?.transform); const tracks = buildAnimationTracks(normalizeAnimation(animation, {}), { base, writeFullEffect: false }); @@ -29,4 +32,5 @@ export function seekAnimationPreview( tracks.forEach((track) => set(state, track.path, sampleTrack(track.points, time))); WebGAL.gameplay.pixiStage?.removeAnimationByTargetKey(target); applyStageEffectToTarget(target, state); + return { transform: state, baseTransform: base }; } diff --git a/packages/webgal/src/types/editorPreviewProtocol.ts b/packages/webgal/src/types/editorPreviewProtocol.ts index 57c1bbdb6..ce60d289d 100644 --- a/packages/webgal/src/types/editorPreviewProtocol.ts +++ b/packages/webgal/src/types/editorPreviewProtocol.ts @@ -142,6 +142,13 @@ export interface SeekAnimationPayload { baseTransform?: Transform; } +export interface SeekAnimationResponsePayload { + /** 本次写入目标的生效变换 */ + transform: Transform; + /** 本次使用的基准状态:payload.baseTransform、语句前基线或演算状态中的变换 */ + baseTransform: Transform; +} + export interface SetFontOptimizationPayload { enabled: boolean; } @@ -294,7 +301,12 @@ export const REQUEST_TYPES = [ ...PREVIEW_REQUEST_TYPES, ] as const satisfies readonly RequestType[]; -export type PreviewCommandResponsePayloadByType = Record; +export type PreviewCommandResponsePayloadByType = Omit< + Record, + 'preview.command.seek-animation' +> & { + 'preview.command.seek-animation': SeekAnimationResponsePayload; +}; export const PREVIEW_QUERY_RESPONSE_PAYLOADS = definePayloadMap({ 'preview.query.reference-box': payload(),