Transform Gizmo Refactor

exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py

@@ -67,7 +67,7 @@ def readFromDesign(self) -> "ExporterOptions":
         for field in fields(self):
             attribute = designAttributes.itemByName(INTERNAL_ID, field.name)
             if attribute:
-                attrJsonData = makeObjectFromJson(field.type, json.loads(attribute.value))
+                attrJsonData = makeObjectFromJson(type(field.type), json.loads(attribute.value))
                 setattr(self, field.name, attrJsonData)
 
         return self

exporter/SynthesisFusionAddin/src/Types.py

@@ -109,7 +109,7 @@ def makeObjectFromJson(objType: type, data: Any) -> Any:
     assert is_dataclass(obj) and isinstance(data, dict), "Found unsupported type to decode."
     for field in fields(obj):
         if field.name in data:
-            setattr(obj, field.name, makeObjectFromJson(field.type, data[field.name]))
+            setattr(obj, field.name, makeObjectFromJson(type(field.type), data[field.name]))
         else:
             setattr(obj, field.name, field.default_factory if field.default_factory is not MISSING else field.default)
 

fission/src/Synthesis.tsx

@@ -60,6 +60,8 @@ import AnalyticsConsent from "./ui/components/AnalyticsConsent.tsx"
 import PreferencesSystem from "./systems/preferences/PreferencesSystem.ts"
 import APSManagementModal from "./ui/modals/APSManagementModal.tsx"
 import ConfigurePanel from "./ui/panels/configuring/assembly-config/ConfigurePanel.tsx"
+import GlobalUIComponent from "./ui/components/GlobalUIComponent.tsx"
+import InitialConfigPanel from "./ui/panels/configuring/initial-config/InitialConfigPanel.tsx"
 
 const worker = new Lazy<Worker>(() => new WPILibWSWorker())
 
@@ -162,6 +164,7 @@ function Synthesis() {
                         closeAllPanels={closeAllPanels}
                     >
                         <ToastProvider key="toast-provider">
+                            <GlobalUIComponent />
                             <Scene useStats={import.meta.env.DEV} key="scene-in-toast-provider" />
                             <SceneOverlay />
                             <MainHUD key={"main-hud"} />
@@ -228,6 +231,7 @@ const initialPanels: ReactElement[] = [
     <WSViewPanel key="ws-view" panelId="ws-view" />,
     <DebugPanel key="debug" panelId="debug" />,
     <ConfigurePanel key="configure" panelId="configure" />,
+    <InitialConfigPanel key="initial-config" panelId="initial-config" />,
 ]
 
 export default Synthesis

fission/src/aps/APS.ts

@@ -1,5 +1,5 @@
 import World from "@/systems/World"
-import { MainHUD_AddToast } from "@/ui/components/MainHUD"
+import { Global_AddToast } from "@/ui/components/GlobalUIControls"
 import { Mutex } from "async-mutex"
 
 const APS_AUTH_KEY = "aps_auth"
@@ -14,7 +14,7 @@ export const ENDPOINT_SYNTHESIS_CHALLENGE = `/api/aps/challenge`
 
 const ENDPOINT_AUTODESK_AUTHENTICATION_AUTHORIZE = "https://developer.api.autodesk.com/authentication/v2/authorize"
 const ENDPOINT_AUTODESK_AUTHENTICATION_TOKEN = "https://developer.api.autodesk.com/authentication/v2/token"
-const ENDPOINT_AUTODESK_REVOKE_TOKEN = "https://developer.api.autodesk.com/authentication/v2/revoke"
+const ENDPOINT_AUTODESK_AUTHENTICATION_REVOKE = "https://developer.api.autodesk.com/authentication/v2/revoke"
 const ENDPOINT_AUTODESK_USERINFO = "https://api.userprofile.autodesk.com/userinfo"
 
 export interface APSAuth {
@@ -163,7 +163,7 @@ class APS {
                 ["client_id", CLIENT_ID],
             ] as string[][]),
         }
-        const res = await fetch(ENDPOINT_AUTODESK_REVOKE_TOKEN, opts)
+        const res = await fetch(ENDPOINT_AUTODESK_AUTHENTICATION_REVOKE, opts)
         if (!res.ok) {
             console.log("Failed to revoke auth token:\n")
             return false
@@ -205,7 +205,7 @@ class APS {
             } catch (e) {
                 console.error(e)
                 World.AnalyticsSystem?.Exception("APS Login Failure")
-                MainHUD_AddToast("error", "Error signing in.", "Please try again.")
+                Global_AddToast?.("error", "Error signing in.", "Please try again.")
             }
         })
     }
@@ -236,7 +236,7 @@ class APS {
                 const json = await res.json()
                 if (!res.ok) {
                     if (shouldRelog) {
-                        MainHUD_AddToast("warning", "Must Re-signin.", json.userMessage)
+                        Global_AddToast?.("warning", "Must Re-signin.", json.userMessage)
                         this.auth = undefined
                         await this.requestAuthCode()
                         return false
@@ -249,13 +249,13 @@ class APS {
                 if (this.auth) {
                     await this.loadUserInfo(this.auth)
                     if (APS.userInfo) {
-                        MainHUD_AddToast("info", "ADSK Login", `Hello, ${APS.userInfo.givenName}`)
+                        Global_AddToast?.("info", "ADSK Login", `Hello, ${APS.userInfo.givenName}`)
                     }
                 }
                 return true
             } catch (e) {
                 World.AnalyticsSystem?.Exception("APS Login Failure")
-                MainHUD_AddToast("error", "Error signing in.", "Please try again.")
+                Global_AddToast?.("error", "Error signing in.", "Please try again.")
                 this.auth = undefined
                 await this.requestAuthCode()
                 return false
@@ -281,7 +281,7 @@ class APS {
             const json = await res.json()
             if (!res.ok) {
                 World.AnalyticsSystem?.Exception("APS Login Failure")
-                MainHUD_AddToast("error", "Error signing in.", json.userMessage)
+                Global_AddToast?.("error", "Error signing in.", json.userMessage)
                 this.auth = undefined
                 return
             }
@@ -293,7 +293,7 @@ class APS {
             if (auth) {
                 await this.loadUserInfo(auth)
                 if (APS.userInfo) {
-                    MainHUD_AddToast("info", "ADSK Login", `Hello, ${APS.userInfo.givenName}`)
+                    Global_AddToast?.("info", "ADSK Login", `Hello, ${APS.userInfo.givenName}`)
                 }
             } else {
                 console.error("Couldn't get auth data.")
@@ -306,7 +306,7 @@ class APS {
         if (retry_login) {
             this.auth = undefined
             World.AnalyticsSystem?.Exception("APS Login Failure")
-            MainHUD_AddToast("error", "Error signing in.", "Please try again.")
+            Global_AddToast?.("error", "Error signing in.", "Please try again.")
         }
     }
 
@@ -327,7 +327,7 @@ class APS {
             const json = await res.json()
             if (!res.ok) {
                 World.AnalyticsSystem?.Exception("APS Failure: User Info")
-                MainHUD_AddToast("error", "Error fetching user data.", json.userMessage)
+                Global_AddToast?.("error", "Error fetching user data.", json.userMessage)
                 this.auth = undefined
                 await this.requestAuthCode()
                 return
@@ -347,7 +347,7 @@ class APS {
         } catch (e) {
             console.error(e)
             World.AnalyticsSystem?.Exception("APS Login Failure: User Info")
-            MainHUD_AddToast("error", "Error signing in.", "Please try again.")
+            Global_AddToast?.("error", "Error signing in.", "Please try again.")
             this.auth = undefined
         }
     }
@@ -363,7 +363,7 @@ class APS {
         } catch (e) {
             console.error(e)
             World.AnalyticsSystem?.Exception("APS Login Failure: Code Challenge")
-            MainHUD_AddToast("error", "Error signing in.", "Please try again.")
+            Global_AddToast?.("error", "Error signing in.", "Please try again.")
         }
     }
 }

fission/src/aps/APSDataManagement.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { MainHUD_AddToast } from "@/ui/components/MainHUD"
+import { Global_AddToast } from "@/ui/components/GlobalUIControls"
 import APS from "./APS"
 import TaskStatus from "@/util/TaskStatus"
 import { Mutex } from "async-mutex"
@@ -140,9 +140,9 @@ export async function getHubs(): Promise<Hub[] | undefined> {
         console.log(auth)
         console.log(APS.userInfo)
         if (e instanceof APSDataError) {
-            MainHUD_AddToast("error", e.title, e.detail)
+            Global_AddToast?.("error", e.title, e.detail)
         } else if (e instanceof Error) {
-            MainHUD_AddToast("error", "Failed to get hubs.", e.message)
+            Global_AddToast?.("error", "Failed to get hubs.", e.message)
         }
         return undefined
     }
@@ -179,7 +179,7 @@ export async function getProjects(hub: Hub): Promise<Project[] | undefined> {
     } catch (e) {
         console.error("Failed to get hubs")
         if (e instanceof Error) {
-            MainHUD_AddToast("error", "Failed to get hubs.", e.message)
+            Global_AddToast?.("error", "Failed to get hubs.", e.message)
         }
         return undefined
     }
@@ -224,7 +224,7 @@ export async function getFolderData(project: Project, folder: Folder): Promise<D
     } catch (e) {
         console.error("Failed to get folder data")
         if (e instanceof Error) {
-            MainHUD_AddToast("error", "Failed to get folder data.", e.message)
+            Global_AddToast?.("error", "Failed to get folder data.", e.message)
         }
         return undefined
     }
@@ -250,7 +250,7 @@ export async function searchFolder(project: Project, folder: Folder, filters?: F
         },
     })
     if (!res.ok) {
-        MainHUD_AddToast("error", "Error getting cloud files.", "Please sign in again.")
+        Global_AddToast?.("error", "Error getting cloud files.", "Please sign in again.")
         return []
     }
     const json = await res.json()

fission/src/mirabuf/MirabufInstance.ts

@@ -234,8 +234,6 @@ class MirabufInstance {
             }
         }
 
-        console.debug(batchMap)
-
         // Construct batched meshes
         batchMap.forEach((materialBodyMap, material) => {
             const count = countMap.get(material)!