Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { ITransform } from '@/Core/Modules/stage/stageInterface';
import type { SetEffectPayload } from '@/types/editorPreviewProtocol';

type SetEffectTransformInput = SetEffectPayload['transform'];

export function mergeSetEffectPreviewTransform(
baseline: ITransform,
transform?: SetEffectTransformInput,
): ITransform {
return {
...baseline,
...(transform ?? {}),
position: {
...baseline.position,
...(transform?.position ?? {}),
},
scale: {
...baseline.scale,
...(transform?.scale ?? {}),
},
};
}
39 changes: 22 additions & 17 deletions packages/webgal/src/Core/util/syncWithEditor/previewSyncRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import { resetStage } from '@/Core/controller/stage/resetStage';
import { logger } from '@/Core/util/logger';
import { stageStateManager } from '@/Core/Modules/stage/stageStateManager';
import { baseTransform } from '@/Core/Modules/stage/stageInterface';
import type { IStageState } from '@/Core/Modules/stage/stageInterface';
import type { IStageState, ITransform } from '@/Core/Modules/stage/stageInterface';
import { mergeSetEffectPreviewTransform } from './previewSetEffectTransform';
import { requestEmbeddedLaunchId } from './runtime/embeddedPreviewBootstrap';
import {
createPreviewSyncTransport,
Expand Down Expand Up @@ -75,6 +76,7 @@ export const startPreviewSyncRuntime = () => {
let lastPublishedSceneName: string | null = null;
let lastPublishedSentenceId: number | null = null;
let lastPublishedStageState: StageStateSnapshot | null = null;
const setEffectBaselines = new Map<string, ITransform>();
const embeddedLaunchIdPromise = requestEmbeddedLaunchId();
let transport!: PreviewSyncTransport;

Expand All @@ -88,6 +90,7 @@ export const startPreviewSyncRuntime = () => {
lastPublishedSceneName = null;
lastPublishedSentenceId = null;
lastPublishedStageState = null;
setEffectBaselines.clear();
};

const buildStageStateSnapshot = (stageState: StageStateSnapshot): StageSnapshotUpdatedPayload['stageState'] => {
Expand Down Expand Up @@ -163,10 +166,12 @@ export const startPreviewSyncRuntime = () => {
};

const handleSyncScene = (payload: SyncScenePayload) => {
setEffectBaselines.clear();
executePreviewSyncSceneCommand(payload, emitFastPreviewTimeout);
};

const handleRunSnippet = (payload: RunSnippetPayload) => {
setEffectBaselines.clear();
applyPreviewDebugVariables(payload.debugVariables);
const scene = WebgalParser.parse(payload.snippet, 'temp.txt', 'temp.txt');
(scene.sentenceList as unknown as ISentence[]).forEach((sentence) => {
Expand Down Expand Up @@ -199,6 +204,7 @@ export const startPreviewSyncRuntime = () => {
};

const handleRunSceneContent = (payload: RunSceneContentPayload) => {
setEffectBaselines.clear();
resetStage(true);
applyPreviewDebugVariables(payload.debugVariables);
WebGAL.sceneManager.sceneData.currentScene = sceneParser(payload.sceneContent, 'temp', './temp.txt');
Expand All @@ -225,23 +231,22 @@ export const startPreviewSyncRuntime = () => {
setDebugTextReadMode(payload.isRead);
};

const handleSetEffect = (payload: SetEffectPayload) => {
const targetEffect = stageStateManager
const getSetEffectBaseline = (target: string): ITransform => {
const cachedBaseline = setEffectBaselines.get(target);
if (cachedBaseline) {
return cachedBaseline;
}

const currentTransform = stageStateManager
.getCalculationStageState()
.effects.find((effect) => effect.target === payload.target);
const targetTransform = targetEffect?.transform ? targetEffect.transform : baseTransform;
const newTransform = {
...targetTransform,
...(payload.transform ?? {}),
position: {
...targetTransform.position,
...(payload.transform?.position ?? {}),
},
scale: {
...targetTransform.scale,
...(payload.transform?.scale ?? {}),
},
};
.effects.find((effect) => effect.target === target)?.transform;
const baseline = mergeSetEffectPreviewTransform(baseTransform, currentTransform);
setEffectBaselines.set(target, baseline);
return baseline;
};

const handleSetEffect = (payload: SetEffectPayload) => {
const newTransform = mergeSetEffectPreviewTransform(getSetEffectBaseline(payload.target), payload.transform);
WebGAL.gameplay.pixiStage?.removeAnimationByTargetKey(payload.target);
stageStateManager.updateEffectAndCommit({
target: payload.target,
Expand Down
Loading