diff --git a/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx b/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx index d1b2fa3828..2544eb5075 100644 --- a/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx +++ b/app/pages/PageEnigma/contexts/TrackContext/TrackProvider.tsx @@ -24,6 +24,8 @@ export const TrackProvider = ({ children }: Props) => { // cross group functions const dropClip = useCallback(() => { + + console.log(`${canDrop.value} ${dragItem.value} ${dragItem.value.type}`) if (canDrop.value && dragItem.value) { if (dragItem.value.type === AssetType.ANIMATION) { addCharacterAnimation({ @@ -44,6 +46,18 @@ export const TrackProvider = ({ children }: Props) => { offset: dropOffset.value, }); } + if (dragItem.value.type === AssetType.CHARACTER) { + console.log("Dragged In Character Type") + } + if (dragItem.value.type === AssetType.CAMERA) { + console.log("Dragged In Camera Type") + } + if (dragItem.value.type === AssetType.OBJECT) { + console.log("Dragged In Object Type") + } + if (dragItem.value.type === AssetType.SHAPE) { + console.log("Dragged In Shape Type") + } } endDrag(); }, [endDrag]); diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 3678215b3b..553aae4e68 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -15,7 +15,7 @@ import { BokehPass } from "three/addons/postprocessing/BokehPass.js"; 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"; +import { TimeLine } from "./timeline.js"; import { ClipUI } from "../datastructures/clips/clip_ui.js"; import { LipSyncEngine } from "./lip_sync_engine.js"; import { AnimationEngine } from "./animation_engine.js"; @@ -28,21 +28,7 @@ import { XYZ } from "../datastructures/common"; import { StoryTellerProxyScene } from "../proxy/storyteller_proxy_scene"; import { StoryTellerProxyTimeline } from "../proxy/storyteller_proxy_timeline"; -class EditorState { - // { - // action: "ShowLoadingIndicator" - // source: "Editor" - // data: { "message" : "saving scene" } - // } - selected_object: THREE.Object3D | undefined; - is_loading: boolean; - - constructor() { - this.selected_object; - this.is_loading = false; - } -} // Main editor class that will call everything else all you need to call is " initialize() ". class Editor { version: number; @@ -1154,7 +1140,7 @@ class Editor { this.raycaster.setFromCamera(this.mouse, this.camera); const interactable: any[] = []; this.activeScene.scene.children.forEach((child: THREE.Object3D) => { - console.log(child); + // console.log(child); if (child.name != "") { if (child.type == "Mesh" || child.type == "Object3D") { interactable.push(child); diff --git a/app/pages/PageEnigma/store/media.ts b/app/pages/PageEnigma/store/media.ts index 6befd4c855..d8bc5fcc6a 100644 --- a/app/pages/PageEnigma/store/media.ts +++ b/app/pages/PageEnigma/store/media.ts @@ -77,14 +77,14 @@ export const audioItems = signal([ export const cameraItems = signal([ { version: 1, - media_id: "m_w5nn3kjh1fbkmjrdac5b2qaba0pmyt", + media_id: uuid.v4(), type: AssetType.CAMERA, name: "Portrait Zoom Out", thumbnail: "resources/placeholders/placeholder.png", }, { version: 1, - media_id: "m_w5nn3kjh1fbkmjrdac5b2qaba0pmyt", + media_id: uuid.v4(), type: AssetType.CAMERA, name: "Pan Left and Right", thumbnail: "resources/placeholders/placeholder.png",