From 45bbdaf89c3e9d23e313c4d025f91bcdd7c9c1d3 Mon Sep 17 00:00:00 2001
From: Miles Ryan <75916236+Quicksticks-oss@users.noreply.github.com>
Date: Mon, 29 Apr 2024 15:28:09 -0400
Subject: [PATCH] Fixed camera loading by setting layer and updated the proxy
 scene. (#265)

Updated camera layer on line 499 to fix P1 Loading in a scene bugs out
the camera view in trello.

Fixed loading because load_glb does not exist anymore and was replaced
with loadGlbWithPlaceholderso that is now updated
fixed points creation when loading and added rotation and scale.
also updated the parimitive loading because it returns an object and we
need a UUID
---
 app/pages/PageEnigma/js/editor.ts                     | 1 +
 app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts
index 9640994354..b86f57660e 100644
--- a/app/pages/PageEnigma/js/editor.ts
+++ b/app/pages/PageEnigma/js/editor.ts
@@ -496,6 +496,7 @@ class Editor {
     );
     await proxyScene.loadFromSceneJson(scene_json["scene"]);
     this.cam_obj = this.activeScene.get_object_by_name(this.camera_name);
+    this.cam_obj?.layers.set(1);
 
     const proxyTimeline = new StoryTellerProxyTimeline(
       this.version,
diff --git a/app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts b/app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts
index 9d5af3914a..5956401d47 100644
--- a/app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts
+++ b/app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts
@@ -69,7 +69,7 @@ export class StoryTellerProxyScene {
         let obj;
         switch (token) {
           case "Parim":
-            let prim_uuid = this.scene.instantiate(json_object.object_name);
+            let prim_uuid = this.scene.instantiate(json_object.object_name).uuid;
             obj = this.scene.get_object_by_uuid(prim_uuid);
             break;
           case "DirectionalLight":
@@ -77,10 +77,12 @@ export class StoryTellerProxyScene {
             break;
           default:
             if (token.includes("m_")) {
-              obj = await this.scene.load_glb(token);
+              obj = await this.scene.loadGlbWithPlaceholder(token, json_object.object_name);
             } else if (token.includes("Point::")) {
               let keyframe_uuid = token.replace("Point::", "");
               obj = this.scene.createPoint(
+                new THREE.Vector3(0, 0, 0),
+                new THREE.Vector3(0, 0, 0),
                 new THREE.Vector3(0, 0, 0),
                 keyframe_uuid,
               );