From f2f36023e678692d4c29ddc6814e59cdef0bedc8 Mon Sep 17 00:00:00 2001
From: arorad1 <dhruv.arora1@autodesk.com>
Date: Mon, 15 Jul 2024 13:00:54 -0700
Subject: [PATCH 1/4] Removed the unaccessable _deleteGizmoOnEscape variable &
 fixed manageassemblies not deleting the gizmo & removed duplicate function
 implementation

---
 fission/src/mirabuf/MirabufSceneObject.ts     | 27 ++++++++++---------
 .../modals/spawning/ManageAssembliesModal.tsx |  4 +++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/fission/src/mirabuf/MirabufSceneObject.ts b/fission/src/mirabuf/MirabufSceneObject.ts
index a7d05a7bb8..7ff655aca0 100644
--- a/fission/src/mirabuf/MirabufSceneObject.ts
+++ b/fission/src/mirabuf/MirabufSceneObject.ts
@@ -30,7 +30,6 @@ class MirabufSceneObject extends SceneObject {
     private _physicsLayerReserve: LayerReserve | undefined = undefined
 
     private _transformGizmos: TransformGizmos | undefined = undefined
-    private _deleteGizmoOnEscape: boolean = true
 
     get mirabufInstance() {
         return this._mirabufInstance
@@ -109,16 +108,12 @@ class MirabufSceneObject extends SceneObject {
             if (this._transformGizmos) {
                 if (InputSystem.isKeyPressed("Enter")) {
                     // confirming placement of the mirabuf object
-                    this._transformGizmos.RemoveGizmos()
-                    this.EnablePhysics()
-                    this._transformGizmos = undefined
+                    this.DisableTransformControls()
                     return
-                } else if (InputSystem.isKeyPressed("Escape") && this._deleteGizmoOnEscape) {
+                } else if (InputSystem.isKeyPressed("Escape")) {
                     // cancelling the creation of the mirabuf scene object
-                    this._transformGizmos.RemoveGizmos()
+                    this.DisableTransformControls()
                     World.SceneRenderer.RemoveSceneObject(this.id)
-                    this._transformGizmos = undefined
-                    this._deleteGizmoOnEscape = false
                     return
                 }
 
@@ -168,10 +163,6 @@ class MirabufSceneObject extends SceneObject {
         this._brain?.clearControls()
     }
 
-    public GetRootNodeId(): Jolt.BodyID | undefined {
-        return this._mechanism.nodeToBody.get(this._mechanism.rootBody)
-    }
-
     private CreateMeshForShape(shape: Jolt.Shape): THREE.Mesh {
         const scale = new JOLT.Vec3(1, 1, 1)
         const triangleContext = new JOLT.ShapeGetTriangles(
@@ -205,6 +196,9 @@ class MirabufSceneObject extends SceneObject {
         return mesh
     }
 
+    /**
+     * Changes the mode of the mirabuf object from being interacted with to being placed.
+     */
     public EnableTransformControls(): void {
         this._transformGizmos = new TransformGizmos(
             new THREE.Mesh(
@@ -218,6 +212,15 @@ class MirabufSceneObject extends SceneObject {
         this.DisablePhysics()
     }
 
+    /**
+     * Changes the mode of the mirabuf object from being placed to being interacted with.
+     */
+    public DisableTransformControls(): void {
+        this._transformGizmos?.RemoveGizmos()
+        this._transformGizmos = undefined
+        this.EnablePhysics()
+    }
+
     private EnablePhysics() {
         this._mirabufInstance.parser.rigidNodes.forEach(rn => {
             World.PhysicsSystem.EnablePhysicsForBody(this._mechanism.GetBodyByNodeId(rn.id)!)
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 3031aec4c9..57a53f1782 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -21,6 +21,10 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ id, update }) => {
             <Button
                 value="Delete"
                 onClick={() => {
+                    if (World.SceneRenderer.sceneObjects.get(id) && World.SceneRenderer.sceneObjects.get(id) instanceof MirabufSceneObject) {
+                        const mirabuf = World.SceneRenderer.sceneObjects.get(id) as MirabufSceneObject
+                        mirabuf.DisableTransformControls()
+                    }
                     World.SceneRenderer.RemoveSceneObject(id)
                     update()
                 }}

From a48913532d1c86665e0f70e012057811dbaf84bd Mon Sep 17 00:00:00 2001
From: arorad1 <dhruv.arora1@autodesk.com>
Date: Mon, 15 Jul 2024 13:17:55 -0700
Subject: [PATCH 2/4] Changed implementation of removing transform gizmos from
 objects as they are deleted

---
 fission/src/ui/modals/spawning/ManageAssembliesModal.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 57a53f1782..b4be3a52a8 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -20,11 +20,9 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ id, update }) => {
             <Label className="text-wrap break-all">{id}</Label>
             <Button
                 value="Delete"
+                // prettier-ignore
                 onClick={() => {
-                    if (World.SceneRenderer.sceneObjects.get(id) && World.SceneRenderer.sceneObjects.get(id) instanceof MirabufSceneObject) {
-                        const mirabuf = World.SceneRenderer.sceneObjects.get(id) as MirabufSceneObject
-                        mirabuf.DisableTransformControls()
-                    }
+                    (World.SceneRenderer.sceneObjects.get(id) as MirabufSceneObject).DisableTransformControls()
                     World.SceneRenderer.RemoveSceneObject(id)
                     update()
                 }}

From cbcf154de3a98aaab8bd87e67f73f36cedb2a130 Mon Sep 17 00:00:00 2001
From: arorad1 <dhruv.arora1@autodesk.com>
Date: Mon, 15 Jul 2024 18:01:30 -0700
Subject: [PATCH 3/4] Made requested changes

---
 fission/src/mirabuf/MirabufSceneObject.ts                | 3 ++-
 fission/src/ui/modals/spawning/ManageAssembliesModal.tsx | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fission/src/mirabuf/MirabufSceneObject.ts b/fission/src/mirabuf/MirabufSceneObject.ts
index 7ff655aca0..0c4bbab0fe 100644
--- a/fission/src/mirabuf/MirabufSceneObject.ts
+++ b/fission/src/mirabuf/MirabufSceneObject.ts
@@ -112,7 +112,6 @@ class MirabufSceneObject extends SceneObject {
                     return
                 } else if (InputSystem.isKeyPressed("Escape")) {
                     // cancelling the creation of the mirabuf scene object
-                    this.DisableTransformControls()
                     World.SceneRenderer.RemoveSceneObject(this.id)
                     return
                 }
@@ -147,6 +146,7 @@ class MirabufSceneObject extends SceneObject {
     }
 
     public Dispose(): void {
+        this.DisableTransformControls()
         World.SimulationSystem.UnregisterMechanism(this._mechanism)
         World.PhysicsSystem.DestroyMechanism(this._mechanism)
         this._mirabufInstance.Dispose(World.SceneRenderer.scene)
@@ -216,6 +216,7 @@ class MirabufSceneObject extends SceneObject {
      * Changes the mode of the mirabuf object from being placed to being interacted with.
      */
     public DisableTransformControls(): void {
+        if (!this._transformGizmos) return
         this._transformGizmos?.RemoveGizmos()
         this._transformGizmos = undefined
         this.EnablePhysics()
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index b4be3a52a8..3031aec4c9 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -20,9 +20,7 @@ const AssemblyCard: React.FC<AssemblyCardProps> = ({ id, update }) => {
             <Label className="text-wrap break-all">{id}</Label>
             <Button
                 value="Delete"
-                // prettier-ignore
                 onClick={() => {
-                    (World.SceneRenderer.sceneObjects.get(id) as MirabufSceneObject).DisableTransformControls()
                     World.SceneRenderer.RemoveSceneObject(id)
                     update()
                 }}

From 72522704a8caba35b861a8e9a392d37cda3c3c8e Mon Sep 17 00:00:00 2001
From: arorad1 <dhruv.arora1@autodesk.com>
Date: Mon, 15 Jul 2024 20:07:53 -0700
Subject: [PATCH 4/4] Added handling suggestion to EnableTransformControls()

---
 fission/src/mirabuf/MirabufSceneObject.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fission/src/mirabuf/MirabufSceneObject.ts b/fission/src/mirabuf/MirabufSceneObject.ts
index 0c4bbab0fe..6d6a1411ce 100644
--- a/fission/src/mirabuf/MirabufSceneObject.ts
+++ b/fission/src/mirabuf/MirabufSceneObject.ts
@@ -200,6 +200,8 @@ class MirabufSceneObject extends SceneObject {
      * Changes the mode of the mirabuf object from being interacted with to being placed.
      */
     public EnableTransformControls(): void {
+        if (this._transformGizmos) return
+
         this._transformGizmos = new TransformGizmos(
             new THREE.Mesh(
                 new THREE.SphereGeometry(3.0),