From fd15dd2eec5dfd96eed7959e5e041d38e9fe8c47 Mon Sep 17 00:00:00 2001 From: Michael Chung <6252325+ArEnSc@users.noreply.github.com> Date: Sat, 23 Mar 2024 01:27:23 -0400 Subject: [PATCH] REmoved uuids for clips --- .../clips/animation_track_clip.ts | 78 ++++++++++--------- .../datastructures/clips/audio_track_clip.ts | 6 +- .../clips/transform_track_clip.ts | 6 +- .../datastructures/scene/scene_object.ts | 2 - app/pages/PageEnigma/js/api_manager.ts | 3 + 5 files changed, 45 insertions(+), 50 deletions(-) diff --git a/app/pages/PageEnigma/datastructures/clips/animation_track_clip.ts b/app/pages/PageEnigma/datastructures/clips/animation_track_clip.ts index 4c4b41d2b5..0617ef3f4e 100644 --- a/app/pages/PageEnigma/datastructures/clips/animation_track_clip.ts +++ b/app/pages/PageEnigma/datastructures/clips/animation_track_clip.ts @@ -1,41 +1,43 @@ export interface AnimationTrackClip { - version: number; - uuid: number; - media_id: number; // comes from the server - type: "animation"; - speed: number; - length: number; - clip_name: string; - } + version: number; + media_id: number; // comes from the server + type: "animation"; + speed: number; + length: number; + clip_name: string; +} export class AnimationTrackClip implements AnimationTrackClip { - version: number; - uuid: number; - media_id: number; // comes from the server - type: "animation"; - speed: number; - length: number; - clip_name: string; - - constructor(version: number, uuid: number, media_id: number, speed: number, length: number, clip_name: string) { - this.version = version; - this.uuid = uuid; - this.media_id = media_id; - this.type = "animation"; - this.speed = speed; - this.length = length; - this.clip_name = clip_name; - } - - toJSON(): string { - return JSON.stringify({ - version: this.version, - uuid: this.uuid, - media_id: this.media_id, - type: this.type, - speed: this.speed, - length: this.length, - clip_name: this.clip_name, - }); - } - } \ No newline at end of file + version: number; + media_id: number; // comes from the server + type: "animation"; + speed: number; + length: number; + clip_name: string; + + constructor( + version: number, + media_id: number, + speed: number, + length: number, + clip_name: string, + ) { + this.version = version; + this.media_id = media_id; + this.type = "animation"; + this.speed = speed; + this.length = length; + this.clip_name = clip_name; + } + + toJSON(): string { + return JSON.stringify({ + version: this.version, + media_id: this.media_id, + type: this.type, + speed: this.speed, + length: this.length, + clip_name: this.clip_name, + }); + } +} diff --git a/app/pages/PageEnigma/datastructures/clips/audio_track_clip.ts b/app/pages/PageEnigma/datastructures/clips/audio_track_clip.ts index 7a3fd172c0..a6a897e57a 100644 --- a/app/pages/PageEnigma/datastructures/clips/audio_track_clip.ts +++ b/app/pages/PageEnigma/datastructures/clips/audio_track_clip.ts @@ -1,6 +1,5 @@ export interface AudioTrackClip { version: number; - uuid: number; media_id: number; type: "audio"; volume: number; @@ -8,14 +7,12 @@ export interface AudioTrackClip { export class AudioTrackClipClass implements AudioTrackClip { version: number; - uuid: number; media_id: number; type: "audio"; volume: number; - constructor(version: number, uuid: number, media_id: number, volume: number) { + constructor(version: number, media_id: number, volume: number) { this.version = version; - this.uuid = uuid; this.media_id = media_id; this.type = "audio"; this.volume = volume; @@ -24,7 +21,6 @@ export class AudioTrackClipClass implements AudioTrackClip { toJSON(): string { return JSON.stringify({ version: this.version, - uuid: this.uuid, media_id: this.media_id, type: this.type, volume: this.volume, diff --git a/app/pages/PageEnigma/datastructures/clips/transform_track_clip.ts b/app/pages/PageEnigma/datastructures/clips/transform_track_clip.ts index f7e5960db5..b1dce41bf3 100644 --- a/app/pages/PageEnigma/datastructures/clips/transform_track_clip.ts +++ b/app/pages/PageEnigma/datastructures/clips/transform_track_clip.ts @@ -6,7 +6,6 @@ export interface Vector3 { export interface TransformTrackClip { version: number; - uuid: number; media_id: number; type: "transform"; position: Vector3[]; @@ -16,16 +15,14 @@ export interface TransformTrackClip { export class TransformTrackClipClass implements TransformTrackClip { version: number; - uuid: number; media_id: number; type: "transform"; position: Vector3[]; rotation: Vector3[]; scale: Vector3[]; - constructor(version: number, uuid: number, media_id: number, position: Vector3[], rotation: Vector3[], scale: Vector3[]) { + constructor(version: number, media_id: number, position: Vector3[], rotation: Vector3[], scale: Vector3[]) { this.version = version; - this.uuid = uuid; this.media_id = media_id; this.type = "transform"; this.position = position; @@ -36,7 +33,6 @@ export class TransformTrackClipClass implements TransformTrackClip { toJSON(): string { return JSON.stringify({ version: this.version, - uuid: this.uuid, media_id: this.media_id, type: this.type, position: this.position, diff --git a/app/pages/PageEnigma/datastructures/scene/scene_object.ts b/app/pages/PageEnigma/datastructures/scene/scene_object.ts index 3d1e8157bd..1242295f67 100644 --- a/app/pages/PageEnigma/datastructures/scene/scene_object.ts +++ b/app/pages/PageEnigma/datastructures/scene/scene_object.ts @@ -96,8 +96,6 @@ export class Timeline implements Timeline { toJSON(): string { return JSON.stringify(this); } - - // For testing purposes static generateMockJson(): string { const mock = { diff --git a/app/pages/PageEnigma/js/api_manager.ts b/app/pages/PageEnigma/js/api_manager.ts index 37cdc519d6..ffd3e8f101 100644 --- a/app/pages/PageEnigma/js/api_manager.ts +++ b/app/pages/PageEnigma/js/api_manager.ts @@ -14,6 +14,9 @@ class MediaUploadManager { return "" } + + + // two core functions to upload things to the server and get id's async uploadMedia(blob:any, fileName:string):Promise { const url = `${this.baseUrl}/v1/media_uploads/upload`; let uuid = uuidv4();