From 2babc244285fc3296fc760d218978dd518185589 Mon Sep 17 00:00:00 2001
From: Miles Ryan <75916236+Quicksticks-oss@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:28:37 -0400
Subject: [PATCH] Adding a character also adds an object of the same name bug
 fix. (#589)

![image](https://github.com/storytold/GottaGoFast/assets/75916236/d2f285a5-75e7-461c-87b0-e423863e1e11)
---
 app/pages/PageEnigma/Editor/timeline.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/pages/PageEnigma/Editor/timeline.ts b/app/pages/PageEnigma/Editor/timeline.ts
index e89b97d69f..b5a1ae644d 100644
--- a/app/pages/PageEnigma/Editor/timeline.ts
+++ b/app/pages/PageEnigma/Editor/timeline.ts
@@ -28,7 +28,6 @@ import { GenerationOptions } from "~/pages/PageEnigma/models/generationOptions";
 import { Vector3 } from "three";
 
 import { outlinerState } from "../signals";
-import { CreationSceneItem } from "./Commands";
 
 export class TimeLine {
   editorEngine: Editor;
@@ -157,7 +156,7 @@ export class TimeLine {
       case toEngineActions.ADD_CHARACTER: {
         const newObject = await this.addCharacter(data.data as MediaItem);
         if (newObject)
-          this.queueNewObjectMessage(newObject, data.data as MediaItem);
+          this.queueNewObjectMessage(newObject, data.data as MediaItem, AssetType.CHARACTER);
         const result = this.editorEngine.sceneManager?.render_outliner(
           this.characters,
         );
@@ -167,7 +166,7 @@ export class TimeLine {
       case toEngineActions.ADD_OBJECT: {
         const newObject = await this.addObject(data.data as MediaItem);
         if (newObject)
-          this.queueNewObjectMessage(newObject, data.data as MediaItem);
+          this.queueNewObjectMessage(newObject, data.data as MediaItem, AssetType.OBJECT);
         const result = this.editorEngine.sceneManager?.render_outliner(
           this.characters,
         );
@@ -177,8 +176,8 @@ export class TimeLine {
       }
       case toEngineActions.ADD_SHAPE: {
         const newShape = await this.addShape(data.data as MediaItem);
-        this.queueNewObjectMessage(newShape, data.data as MediaItem);
-        let result = this.editorEngine.sceneManager?.render_outliner(
+        this.queueNewObjectMessage(newShape, data.data as MediaItem, AssetType.SHAPE);
+        const result = this.editorEngine.sceneManager?.render_outliner(
           this.characters,
         );
         if (result) outlinerState.items.value = result.items;
@@ -267,13 +266,14 @@ export class TimeLine {
   queueNewObjectMessage(
     item: THREE.Object3D<THREE.Object3DEventMap>,
     data: MediaItem,
+    asset_type: AssetType.OBJECT | AssetType.CHARACTER | AssetType.SHAPE
   ) {
     Queue.publish({
       queueName: QueueNames.FROM_ENGINE,
       action: fromEngineActions.ADD_OBJECT,
       data: {
         media_id: data.media_id,
-        type: AssetType.OBJECT,
+        type: asset_type,
         name: item.name,
         object_uuid: item.uuid,
         version: 1,
@@ -545,7 +545,6 @@ export class TimeLine {
       keyframe_uuid,
       keyframe_pos as Vector3,
       keyframe_rot as Vector3,
-      keyframe_scl as Vector3,
     );
     this.checkEditorCanPlay();
   }
@@ -753,7 +752,7 @@ export class TimeLine {
             ].play(object);
             this.lipSync_engine.clips[
               element.object_uuid + element.media_id
-            ].step(this.scrubber_frame_position, element.offset, isRendering);
+            ].step(this.scrubber_frame_position, element.offset);
           }
         } else if (element.type === ClipType.ANIMATION) {
           if (object) {