diff --git a/app/pages/PageEnigma/comps/Timeline/Camera.tsx b/app/pages/PageEnigma/comps/Timeline/Camera.tsx index e60119b680..473d108b74 100644 --- a/app/pages/PageEnigma/comps/Timeline/Camera.tsx +++ b/app/pages/PageEnigma/comps/Timeline/Camera.tsx @@ -1,7 +1,9 @@ import { cameraGroup, fullWidth, updateCamera } from "~/pages/PageEnigma/store"; import { TrackKeyFrames } from "~/pages/PageEnigma/comps/Timeline/TrackKeyFrames"; +import { useSignals } from "@preact/signals-react/runtime"; export const Camera = () => { + useSignals(); const { keyframes } = cameraGroup.value!; return ( diff --git a/app/pages/PageEnigma/comps/Timeline/TrackKeyFrames.tsx b/app/pages/PageEnigma/comps/Timeline/TrackKeyFrames.tsx index a5c5edb377..aea6f7334c 100644 --- a/app/pages/PageEnigma/comps/Timeline/TrackKeyFrames.tsx +++ b/app/pages/PageEnigma/comps/Timeline/TrackKeyFrames.tsx @@ -34,7 +34,6 @@ export const TrackKeyFrames = ({ ? keyframes[index + 1].offset : filmLength.value * 60 } - style={style} updateKeyframe={updateKeyframe} keyframe={keyframe} /> diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 4d89a12b95..4aa6ab2528 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -12,7 +12,7 @@ import { SMAAPass } from "three/addons/postprocessing/SMAAPass.js"; import { SAOPass } from "three/addons/postprocessing/SAOPass.js"; import { UnrealBloomPass } from "three/addons/postprocessing/UnrealBloomPass.js"; import { BokehPass } from "three/addons/postprocessing/BokehPass.js"; -import { FFmpeg, createFFmpeg, fetchFile } from "@ffmpeg/ffmpeg"; +import { createFFmpeg, fetchFile, FFmpeg } from "@ffmpeg/ffmpeg"; import AudioEngine from "./audio_engine.js"; import TransformEngine from "./transform_engine.js"; import { TimeLine, TimelineDataState } from "./timeline.js"; @@ -22,6 +22,7 @@ import { AnimationEngine } from "./animation_engine.js"; import { PointerLockControls } from "three/addons/controls/PointerLockControls.js"; import { APPUI_ACTION_TYPES } from "../reducers"; +import { ClipGroup } from "~/pages/PageEnigma/models/track"; class EditorState { // { @@ -1144,7 +1145,10 @@ class Editor { this.dispatchAppUiState({ type: APPUI_ACTION_TYPES.SHOW_CONTROLPANELS_SCENEOBJECT, payload: { - group: "object", // TODO: add meta data to determine what it is a camera or a object or a character into prefab clips + group: + this.selected.name === "::CAM::" + ? ClipGroup.CAMERA + : ClipGroup.OBJECT, // TODO: add meta data to determine what it is a camera or a object or a character into prefab clips object_uuid: this.selected.uuid, object_name: this.selected.name, version: this.version, diff --git a/app/pages/PageEnigma/store/cameraGroup.ts b/app/pages/PageEnigma/store/cameraGroup.ts index 698abdcde3..1330f9b872 100644 --- a/app/pages/PageEnigma/store/cameraGroup.ts +++ b/app/pages/PageEnigma/store/cameraGroup.ts @@ -33,6 +33,7 @@ export function updateCamera({ id, offset }: { id: string; offset: number }) { } export function addCameraKeyframe(keyframe: QueueKeyframe, offset: number) { + console.log("cam", keyframe); const newKeyframe = { version: keyframe.version, keyframe_uuid: uuid.v4(),