A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
refactor: extract shared uiRectRedirect for timeline runtime
esengine9fa74c5eeb40
diff --git a/sdk/src/timeline/TimelinePlugin.ts b/sdk/src/timeline/TimelinePlugin.tsnew file mode 100644index 000000000..a7b49da42--- /dev/null+++ b/sdk/src/timeline/TimelinePlugin.ts@@ -0,0 +1,177 @@+import type { App, Plugin } from '../app';+import { defineSystem, Schedule } from '../system';+import { Res } from '../resource';+import { Time, type TimeData } from '../resource';+import { defineComponent, Children, Name, getComponent, Transform } from '../component';+import { UIRect } from '../ui/UIRect';+import { isEditor, isPlayMode } from '../env';+import { TrackType, WrapMode, type TimelineAsset } from './TimelineTypes';+import { parseTimelineAsset } from './TimelineLoader';+import { TimelineInstance, advanceTimeline } from './TimelineSystem';+import {+ getAllTimelineInstances,+ getTimelineInstance,+ setTimelineInstance,+ removeTimelineInstance,+ clearTimelineInstances,+} from './TimelineControl';+import { setNestedProperty } from './propertyUtils';+import { redirectPositionToUIRect } from './uiRectRedirect';++export interface TimelinePlayerData {+ timeline: string;+ playing: boolean;+ speed: number;+ wrapMode: string;+}++export const TimelinePlayer = defineComponent<TimelinePlayerData>('TimelinePlayer', {+ timeline: '',+ playing: false,+ speed: 1.0,+ wrapMode: 'once',+});++const loadedAssets_ = new Map<string, TimelineAsset>();++export function registerTimelineAsset(path: string, asset: TimelineAsset): void {+ loadedAssets_.set(path, asset);+}++export function getTimelineAsset(path: string): TimelineAsset | undefined {+ return loadedAssets_.get(path);+}++function resolveChildEntity(world: any, rootEntity: any, childPath: string): any {+ if (!childPath) return rootEntity;++ const parts = childPath.split('/');+ let current = rootEntity;+ for (const part of parts) {+ const childrenData = world.tryGet(current, Children);+ const childEntities = childrenData?.entities ? Array.from(childrenData.entities as Iterable<any>) : [];+ if (childEntities.length === 0) return null;+ let found = false;+ for (const child of childEntities) {+ const nameData = world.tryGet(child, Name);+ if (nameData?.value === part) {+ current = child;+ found = true;+ break;+ }+ }+ if (!found) return null;+ }+ return current;+}++function applyPropertyTrackResults(world: any, rootEntity: any, instance: TimelineInstance): void {+ const results = instance.evaluatePropertyTracks();+ for (const result of results) {+ const targetEntity = resolveChildEntity(world, rootEntity, result.childPath);+ if (targetEntity == null) continue;++ const componentDef = getComponent(result.component);+ if (!componentDef) continue;+ if (!world.has(targetEntity, componentDef)) continue;++ if (result.component === 'Transform' && world.has(targetEntity, UIRect)) {+ const posValues = new Map<string, number>();+ const nonPosValues = new Map<string, number>();+ for (const [propPath, value] of result.values) {+ if (propPath.startsWith('position.')) {+ posValues.set(propPath, value);+ } else {+ nonPosValues.set(propPath, value);+ }+ }++ if (posValues.size > 0) {+ redirectPositionToUIRect(world, targetEntity, posValues);+ }++ if (nonPosValues.size > 0) {+ const data = world.get(targetEntity, componentDef);+ let modified = false;+ for (const [propPath, value] of nonPosValues) {+ if (setNestedProperty(data, propPath, value)) {+ modified = true;+ }+ }+ if (modified) {+ world.set(targetEntity, componentDef, data);+ }+ }+ continue;+ }++ const data = world.get(targetEntity, componentDef);+ let modified = false;+ for (const [propPath, value] of result.values) {+ if (setNestedProperty(data, propPath, value)) {+ modified = true;+ }+ }++ if (modified) {+ world.set(targetEntity, componentDef, data);+ }+ }+}++export class TimelinePlugin implements Plugin {+ name = 'TimelinePlugin';++ build(app: App): void {+ const world = app.world;++ app.addSystemToSchedule(Schedule.Update, defineSystem(+ [Res(Time)],+ (time: TimeData) => {+ if (isEditor() && !isPlayMode()) return;++ const entities = world.getEntitiesWithComponents([TimelinePlayer]);+ for (const entity of entities) {+ const playerData = world.get(entity, TimelinePlayer) as TimelinePlayerData;+ if (!playerData.timeline) continue;++ let instance = getTimelineInstance(entity);++ if (!instance) {+ const asset = loadedAssets_.get(playerData.timeline);+ if (!asset) continue;+ instance = new TimelineInstance(asset);+ setTimelineInstance(entity, instance);+ }++ instance.speed = playerData.speed;+ if (playerData.playing && !instance.playing) {+ if (instance.currentTime === 0) {+ instance.play();+ } else {+ instance.playing = true;+ }+ } else if (!playerData.playing && instance.playing) {+ instance.pause();+ }++ advanceTimeline(instance, time.delta);+ applyPropertyTrackResults(world, entity, instance);++ if (!instance.playing && playerData.playing) {+ playerData.playing = false;+ world.insert(entity, TimelinePlayer, playerData);+ }+ }+ },+ { name: 'TimelineSystem' }+ ));+ }++ cleanup(): void {+ clearTimelineInstances();+ loadedAssets_.clear();+ }+}++export const timelinePlugin = new TimelinePlugin();diff --git a/sdk/src/timeline/uiRectRedirect.ts b/sdk/src/timeline/uiRectRedirect.tsnew file mode 100644index 000000000..bfee2dbee--- /dev/null+++ b/sdk/src/timeline/uiRectRedirect.ts@@ -0,0 +1,23 @@+import { UIRect, type UIRectData } from '../ui/UIRect';+import { Transform } from '../component';++export function redirectPositionToUIRect(+ world: any,+ entity: any,+ posValues: Map<string, number>,+): void {+ const currentTransform = world.get(entity, Transform);+ const currentPos = currentTransform.position;+ const rect = world.get(entity, UIRect) as UIRectData;++ const dx = (posValues.has('position.x') ? posValues.get('position.x')! : currentPos.x) - currentPos.x;+ const dy = (posValues.has('position.y') ? posValues.get('position.y')! : currentPos.y) - currentPos.y;++ if (dx === 0 && dy === 0) return;++ world.set(entity, UIRect, {+ ...rect,+ offsetMin: { x: rect.offsetMin.x + dx, y: rect.offsetMin.y + dy },+ offsetMax: { x: rect.offsetMax.x + dx, y: rect.offsetMax.y + dy },+ });+}