From 70e99a109f6edf853ebc31f025995abe3997a5ff Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Mon, 16 Dec 2024 15:44:33 -0800 Subject: [PATCH] Move engines to separate folder --- app/pages/PageEnigma/Editor/EditorState/timeline_state.ts | 2 +- .../PageEnigma/Editor/{ => Engines}/animation_engine.ts | 5 ++++- app/pages/PageEnigma/Editor/{ => Engines}/audio_engine.ts | 0 .../PageEnigma/Editor/{ => Engines}/emotion_engine.ts | 0 .../PageEnigma/Editor/{ => Engines}/lip_sync_engine.ts | 0 .../PageEnigma/Editor/{ => Engines}/transform_engine.ts | 0 app/pages/PageEnigma/Editor/editor.ts | 8 ++++---- app/pages/PageEnigma/Editor/timeline.ts | 2 +- app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) rename app/pages/PageEnigma/Editor/{ => Engines}/animation_engine.ts (76%) rename app/pages/PageEnigma/Editor/{ => Engines}/audio_engine.ts (100%) rename app/pages/PageEnigma/Editor/{ => Engines}/emotion_engine.ts (100%) rename app/pages/PageEnigma/Editor/{ => Engines}/lip_sync_engine.ts (100%) rename app/pages/PageEnigma/Editor/{ => Engines}/transform_engine.ts (100%) diff --git a/app/pages/PageEnigma/Editor/EditorState/timeline_state.ts b/app/pages/PageEnigma/Editor/EditorState/timeline_state.ts index 24657f52fd..d2f34731da 100644 --- a/app/pages/PageEnigma/Editor/EditorState/timeline_state.ts +++ b/app/pages/PageEnigma/Editor/EditorState/timeline_state.ts @@ -1,5 +1,5 @@ import { deepCopySerializableObjects as deepCopy } from "~/utilities"; -import { AnimationEngine } from "../animation_engine"; +import { AnimationEngine } from "../Engines/animation_engine"; import AudioEngine from "../audio_engine"; import EmotionEngine from "../emotion_engine"; import { LipSyncEngine } from "../lip_sync_engine"; diff --git a/app/pages/PageEnigma/Editor/animation_engine.ts b/app/pages/PageEnigma/Editor/Engines/animation_engine.ts similarity index 76% rename from app/pages/PageEnigma/Editor/animation_engine.ts rename to app/pages/PageEnigma/Editor/Engines/animation_engine.ts index cecc914b9b..f735250d8e 100644 --- a/app/pages/PageEnigma/Editor/animation_engine.ts +++ b/app/pages/PageEnigma/Editor/Engines/animation_engine.ts @@ -1,4 +1,4 @@ -import { AnimationClip } from "../clips/animation_clip"; +import { AnimationClip } from "../../clips/animation_clip"; export class AnimationEngine { clips: { [key: string]: AnimationClip } = {}; @@ -10,6 +10,7 @@ export class AnimationEngine { } load_object(object_uuid: string, media_id: string, clip_name: string) { + console.debug("load_object", object_uuid, media_id, clip_name); this.clips[object_uuid + media_id] = new AnimationClip( this.version, media_id, @@ -18,6 +19,8 @@ export class AnimationEngine { 1.0, 1.0, clip_name, + 0.0, + 0.0, ); //this.clips[object_uuid + media_id]._load_animation(); } diff --git a/app/pages/PageEnigma/Editor/audio_engine.ts b/app/pages/PageEnigma/Editor/Engines/audio_engine.ts similarity index 100% rename from app/pages/PageEnigma/Editor/audio_engine.ts rename to app/pages/PageEnigma/Editor/Engines/audio_engine.ts diff --git a/app/pages/PageEnigma/Editor/emotion_engine.ts b/app/pages/PageEnigma/Editor/Engines/emotion_engine.ts similarity index 100% rename from app/pages/PageEnigma/Editor/emotion_engine.ts rename to app/pages/PageEnigma/Editor/Engines/emotion_engine.ts diff --git a/app/pages/PageEnigma/Editor/lip_sync_engine.ts b/app/pages/PageEnigma/Editor/Engines/lip_sync_engine.ts similarity index 100% rename from app/pages/PageEnigma/Editor/lip_sync_engine.ts rename to app/pages/PageEnigma/Editor/Engines/lip_sync_engine.ts diff --git a/app/pages/PageEnigma/Editor/transform_engine.ts b/app/pages/PageEnigma/Editor/Engines/transform_engine.ts similarity index 100% rename from app/pages/PageEnigma/Editor/transform_engine.ts rename to app/pages/PageEnigma/Editor/Engines/transform_engine.ts diff --git a/app/pages/PageEnigma/Editor/editor.ts b/app/pages/PageEnigma/Editor/editor.ts index a762f3ea62..74b4dac6f5 100644 --- a/app/pages/PageEnigma/Editor/editor.ts +++ b/app/pages/PageEnigma/Editor/editor.ts @@ -16,7 +16,7 @@ import TransformEngine from "./transform_engine.js"; import EmotionEngine from "./emotion_engine"; import { TimeLine } from "./timeline.js"; import { LipSyncEngine } from "./lip_sync_engine.js"; -import { AnimationEngine } from "./animation_engine.js"; +import { AnimationEngine } from "./Engines/animation_engine.js"; import { PointerLockControls } from "three/addons/controls/PointerLockControls.js"; import { EditorStates, CameraAspectRatio } from "~/pages/PageEnigma/enums"; import { AssetType, ClipGroup } from "~/enums"; @@ -221,7 +221,7 @@ class Editor { "" + this.version, this.camera_name, this.updateSurfaceIdAttributeToMesh.bind(this), - this.version + this.version, ); this.activeScene.initialize(); this.generating_preview = false; @@ -946,14 +946,14 @@ class Editor { this.render_camera_aspect_ratio === CameraAspectRatio.HORIZONTAL_16_9 ? 1024 : this.render_camera_aspect_ratio === - CameraAspectRatio.VERTICAL_9_16 + CameraAspectRatio.VERTICAL_9_16 ? 576 : 1000; const height = this.render_camera_aspect_ratio === CameraAspectRatio.HORIZONTAL_16_9 ? 576 : this.render_camera_aspect_ratio === - CameraAspectRatio.VERTICAL_9_16 + CameraAspectRatio.VERTICAL_9_16 ? 1024 : 1000; diff --git a/app/pages/PageEnigma/Editor/timeline.ts b/app/pages/PageEnigma/Editor/timeline.ts index ac8b210c86..ced5a70e7d 100644 --- a/app/pages/PageEnigma/Editor/timeline.ts +++ b/app/pages/PageEnigma/Editor/timeline.ts @@ -6,7 +6,7 @@ import Scene from "./scene.js"; import AudioEngine from "./audio_engine"; import TransformEngine from "./transform_engine"; import { LipSyncEngine } from "./lip_sync_engine"; -import { AnimationEngine } from "./animation_engine"; +import { AnimationEngine } from "./Engines/animation_engine"; import Queue, { UnionedActionTypes, diff --git a/app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts b/app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts index 45bbe5250d..5a7b031af3 100644 --- a/app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts +++ b/app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts @@ -4,7 +4,7 @@ import { ClipUI } from "../clips/clip_ui"; import { EmotionClip } from "../clips/emotion_clip"; import { LipSyncClip } from "../clips/lipsync_clip"; import { TransformClip } from "../clips/transform_clip"; -import AnimationEngine from "../Editor/animation_engine"; +import AnimationEngine from "../Editor/Engines/animation_engine"; import AudioEngine from "../Editor/audio_engine"; import EmotionEngine from "../Editor/emotion_engine"; import LipSyncEngine from "../Editor/lip_sync_engine";