Merge branch 'feature/load-char' of github.com:storytold/GottaGoFast into feature/load-ui

app/pages/PageEnigma/datastructures/clips/clip_ui.ts

@@ -13,6 +13,7 @@ export class ClipUI {
   offset: number; // in frames
   length: number; // in frames
   should_play: boolean;
+  clip_uuid: string;
 
   constructor(
     version: number,
@@ -20,6 +21,7 @@ export class ClipUI {
     group: ClipGroup,
     name: string,
     media_id: string,
+    clip_uuid: string,
     object_uuid: string,
     object_name: string,
     offset: number,
@@ -28,6 +30,8 @@ export class ClipUI {
     this.version = version;
     this.group = group; // Only needed for UI
 
+    this.clip_uuid = clip_uuid;
+
     this.name = name; // UI
     this.type = type; // UI and Animation / Audio / Lipsync /  : Engine
 
@@ -45,6 +49,7 @@ export class ClipUI {
       group: this.group,
       name: this.name,
       type: this.type,
+      clip_uuid: this.clip_uuid,
       object_uuid: this.object_uuid,
       object_name: this.object_name,
       media_id: this.media_id,

app/pages/PageEnigma/js/timeline.ts

@@ -174,6 +174,7 @@ export class TimeLine {
         // selected?: boolean;
         let data_json = data['data'];
         let uuid = data_json['object_uuid'];
+        let keyframe_uuid = data_json['keyframe_uuid'];
 
         let object_name = this.scene.get_object_by_uuid(uuid)?.name;
         if (object_name == undefined) {
@@ -193,6 +194,7 @@ export class TimeLine {
                 ClipType.TRANSFORM,
                 data_json['group'],
                 object_name,
+                keyframe_uuid,
                 "",
                 uuid,
                 object_name,
@@ -217,7 +219,13 @@ export class TimeLine {
         const type = data["data"]["type"];
         const offset = data["data"]["offset"];
         const end_offset = data["data"]["length"] + offset;
-        const object_name = this.scene.get_object_by_uuid(object_uuid)?.name;
+        let object_name = this.scene.get_object_by_uuid(object_uuid)?.name;
+        const clip_uuid = data["data"]['clip_uuid'];
+        console.log(data);
+
+        if(object_name == undefined) {
+            object_name = "Undefined."
+        }
 
         switch (type) {
             case "animation":
@@ -237,6 +245,7 @@ export class TimeLine {
                             group,
                             name,
                             media_id,
+                            clip_uuid,
                             object_uuid,
                             object_name,
                             offset,
@@ -256,6 +265,7 @@ export class TimeLine {
                 group,
                 name,
                 media_id,
+                clip_uuid,
                 object_uuid,
                 object_name,
                 offset,

app/pages/PageEnigma/proxy/storyteller_proxy_timeline.ts

@@ -64,6 +64,7 @@ export class StoryTellerProxyTimeline {
                 let clip = new ClipUI(
                     element.version, element.type, 
                     element.group, element.name, 
+                    element.clip_uuid,
                     element.media_id, element.object_uuid, 
                     element.object_name,
                     element.start_offset, element.ending_offset);