Merge branch 'dev' into alexey/273/arcade-to-swerve-turning

Author: AlexD717

fission/src/mirabuf/MirabufLoader.ts

@@ -8,6 +8,7 @@ import InitialConfigPanel from "@/panels/configuring/initial-config/InitialConfi
 import { PAUSE_REF_ASSEMBLY_SPAWNING } from "@/systems/physics/PhysicsTypes.ts"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject.ts"
 import { getTargetControls } from "@/systems/scene/CameraControls.ts"
+import { detectAndTagWheels } from "@/systems/simulation/synthesis_brain/WheelDetector"
 import type { EncodedAssembly, Message } from "@/systems/multiplayer/types.ts"
 import { ProgressHandle } from "@/components/ProgressNotificationData.ts"
 
@@ -271,6 +272,10 @@ class MirabufCachingService {
             return
         }
 
+        if (assembly.dynamic) {
+            detectAndTagWheels(assembly)
+        }
+
         const info = await MirabufCachingService.storeAssemblyInCache(assembly, { miraType })
         if (!info) return
 

fission/src/systems/simulation/synthesis_brain/WheelDetector.ts

@@ -287,6 +287,9 @@ export function detectAndTagWheels(assembly: mirabuf.Assembly): void {
     const jointDefs = assembly.data?.joints?.jointDefinitions as Record<string, mirabuf.joint.IJoint> | undefined
     if (!jointDefs) return
 
+    const hasExistingWheels = Object.values(jointDefs).some(jDef => jDef.userData?.data?.["wheel"] === "true")
+    if (hasExistingWheels) return
+
     const candidates = extractCandidates(jointDefs)
     if (candidates.length < 2) return
 

fission/src/ui/UIProvider.tsx

@@ -3,7 +3,7 @@ import type { SnackbarKey, SnackbarMessage, VariantType } from "notistack"
 import { useSnackbar } from "notistack"
 import type React from "react"
 import type { FunctionComponent, ReactNode } from "react"
-import { useCallback, useReducer, useState } from "react"
+import { Fragment, useCallback, useReducer, useState } from "react"
 import { v4 as uuidv4 } from "uuid"
 import type { ModalImplProps } from "./components/Modal"
 import type { PanelImplProps } from "./components/Panel"
@@ -158,16 +158,18 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
     const addToast = useCallback(
         (variant: VariantType, ...contents: SnackbarMessage[]) => {
             enqueueSnackbar(
-                contents.length <= 1
-                    ? { ...contents }
-                    : {
-                          ...contents.map(child => (
-                              <>
-                                  {child}
-                                  <br />
-                              </>
-                          )),
-                      },
+                contents.length <= 1 ? (
+                    (contents[0] ?? "")
+                ) : (
+                    <span>
+                        {contents.map((content, index) => (
+                            <Fragment key={index}>
+                                {content}
+                                {index < contents.length - 1 && <br />}
+                            </Fragment>
+                        ))}
+                    </span>
+                ),
                 { variant, action: snackbarAction }
             )
         },

fission/src/ui/panels/configuring/assembly-config/interfaces/cameras/CameraConfigInterface.tsx

@@ -101,7 +101,7 @@ const CameraConfigInterface: React.FC<CameraConfigInterfaceProps> = ({ selectedR
     const gizmoComponent = useMemo(() => {
         if (!camera) {
             gizmoRef.current = undefined
-            return <></>
+            return null
         }
 
         const postGizmoCreation = (gizmo: GizmoSceneObject) => {