Merge remote-tracking branch 'origin/dev' into ryan/1973/animate-game-piece-intake

Author: ryanzhangofficial

fission/src/mirabuf/FieldMiraEditor.ts

@@ -1,7 +1,8 @@
 import { mirabuf } from "../proto/mirabuf"
+import { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
 
 interface DevtoolMiraData {
-    "devtool:scoring_zones": unknown
+    "devtool:scoring_zones": ScoringZonePreferences[]
     "devtool:camera_locations": unknown
     "devtool:spawn_points": unknown
     "devtool:a": unknown

fission/src/mirabuf/MirabufLoader.ts

@@ -241,6 +241,49 @@ class MirabufCachingService {
         }
     }
 
+    /**
+     * Caches and gets local Mirabuf file with cache info
+     *
+     * @param {ArrayBuffer} buffer ArrayBuffer of Mirabuf file.
+     * @param {MiraType} miraType Type of Mirabuf Assembly.
+     *
+     * @returns {Promise<{assembly: mirabuf.Assembly, cacheInfo: MirabufCacheInfo} | undefined>} Promise with the result of the promise. Assembly and cache info of the mirabuf file if successful, undefined if not.
+     */
+    public static async cacheAndGetLocalWithInfo(
+        buffer: ArrayBuffer,
+        miraType: MiraType
+    ): Promise<{ assembly: mirabuf.Assembly; cacheInfo: MirabufCacheInfo } | undefined> {
+        const key = await this.hashBuffer(buffer)
+        const map = MirabufCachingService.getCacheMap(miraType)
+        const target = map[key]
+        const assembly = this.assemblyFromBuffer(buffer)
+
+        // Check if assembly has devtool data and update name accordingly
+        let displayName = assembly.info?.name ?? undefined
+        if (assembly.data?.parts?.userData?.data) {
+            const devtoolKeys = Object.keys(assembly.data.parts.userData.data).filter(k => k.startsWith("devtool:"))
+            if (devtoolKeys.length > 0) {
+                displayName = displayName ? `Edited ${displayName}` : "Edited Field"
+            }
+        }
+
+        if (!target) {
+            const cacheInfo = await MirabufCachingService.storeInCache(key, buffer, miraType, displayName)
+            if (cacheInfo) {
+                return { assembly, cacheInfo }
+            }
+        } else {
+            // Update existing cache info with new name if it has devtool data
+            if (displayName && displayName !== target.name) {
+                await MirabufCachingService.cacheInfo(key, miraType, displayName)
+                target.name = displayName
+            }
+            return { assembly, cacheInfo: target }
+        }
+
+        return undefined
+    }
+
     /**
      * Caches and gets local Mirabuf file
      *
@@ -258,8 +301,17 @@ class MirabufCachingService {
         const target = map[key]
         const assembly = this.assemblyFromBuffer(buffer)
 
+        // Check if assembly has devtool data and update name accordingly
+        let displayName = assembly.info?.name ?? undefined
+        if (assembly.data?.parts?.userData?.data) {
+            const devtoolKeys = Object.keys(assembly.data.parts.userData.data).filter(k => k.startsWith("devtool:"))
+            if (devtoolKeys.length > 0) {
+                displayName = displayName ? `Edited ${displayName}` : "Edited Field"
+            }
+        }
+
         if (!target) {
-            await MirabufCachingService.storeInCache(key, buffer, miraType, assembly.info?.name ?? undefined)
+            await MirabufCachingService.storeInCache(key, buffer, miraType, displayName)
         }
 
         return assembly
@@ -369,6 +421,55 @@ class MirabufCachingService {
         backUpFields = {}
     }
 
+    /**
+     * Persists devtool changes back to the cache by re-encoding the assembly
+     *
+     * @param {MirabufCacheID} id ID of the cached mirabuf file
+     * @param {MiraType} miraType Type of Mirabuf Assembly
+     * @param {mirabuf.Assembly} assembly The updated assembly with devtool changes
+     *
+     * @returns {Promise<boolean>} Promise with the result. True if successful, false if not.
+     */
+    public static async persistDevtoolChanges(
+        id: MirabufCacheID,
+        miraType: MiraType,
+        assembly: mirabuf.Assembly
+    ): Promise<boolean> {
+        try {
+            // Re-encode the assembly with devtool changes
+            const updatedBuffer = mirabuf.Assembly.encode(assembly).finish()
+
+            // Update the cached buffer
+            const cache = miraType == MiraType.ROBOT ? backUpRobots : backUpFields
+            if (cache[id]) {
+                cache[id].buffer = updatedBuffer
+            }
+
+            // Update OPFS if available
+            if (canOPFS) {
+                const fileHandle = await (
+                    miraType == MiraType.ROBOT ? robotFolderHandle : fieldFolderHandle
+                ).getFileHandle(id, { create: false })
+                const writable = await fileHandle.createWritable()
+                await writable.write(updatedBuffer)
+                await writable.close()
+            }
+
+            World.analyticsSystem?.event("Devtool Cache Persist", {
+                key: id,
+                type: miraType == MiraType.ROBOT ? "robot" : "field",
+                assemblyName: assembly.info?.name ?? "unknown",
+                fileSize: updatedBuffer.byteLength,
+            })
+
+            return true
+        } catch (e) {
+            console.error("Failed to persist devtool changes", e)
+            World.analyticsSystem?.exception("Failed to persist devtool changes to cache")
+            return false
+        }
+    }
+
     // Optional name for when assembly is being decoded anyway like in CacheAndGetLocal()
     private static async storeInCache(
         key: string,

fission/src/mirabuf/MirabufSceneObject.ts

@@ -11,6 +11,7 @@ import { BodyAssociate, LayerReserve } from "@/systems/physics/PhysicsSystem"
 import Mechanism from "@/systems/physics/Mechanism"
 import {
     Alliance,
+    Station,
     EjectorPreferences,
     FieldPreferences,
     IntakePreferences,
@@ -42,6 +43,7 @@ import {
 import { SimConfigData } from "@/ui/panels/simulation/SimConfigShared"
 import WPILibBrain from "@/systems/simulation/wpilib_brain/WPILibBrain"
 import { OnContactAddedEvent } from "@/systems/physics/ContactEvents"
+import FieldMiraEditor from "./FieldMiraEditor"
 
 const DEBUG_BODIES = false
 
@@ -73,6 +75,7 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
     private _mechanism: Mechanism
     private _brain: Brain | undefined
     private _alliance: Alliance | undefined
+    private _station: Station | undefined
 
     private _debugBodies: Map<string, RnDebugMeshes> | null
     private _physicsLayerReserve: LayerReserve | undefined
@@ -90,14 +93,14 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
 
     private _nameTag: SceneOverlayTag | undefined
     private _centerOfMassIndicator: THREE.Mesh | undefined
-    private _centerOfMassListenerUnsubscribe: (() => void) | undefined
     private _intakeActive = false
     private _ejectorActive = false
 
     private _lastEjectableToastTime = 0
     private static readonly EJECTABLE_TOAST_COOLDOWN_MS = 500
 
     private _collision?: (event: OnContactAddedEvent) => void
+    private _cacheId?: string
 
     public get intakeActive() {
         return this._intakeActive
@@ -145,7 +148,7 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
     }
 
     public get activeEjectables(): Jolt.BodyID[] {
-        return this._ejectables.map(e => e.gamePieceBodyId!)
+        return this._ejectables.map(e => e.gamePieceBodyId!).filter(x => x !== undefined)
     }
 
     public get miraType(): MiraType {
@@ -164,6 +167,10 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         return this._alliance
     }
 
+    public get station() {
+        return this._station
+    }
+
     public set brain(brain: Brain | undefined) {
         this._brain = brain
         const simLayer = World.simulationSystem.getSimulationLayer(this._mechanism)!
@@ -174,11 +181,25 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         this._alliance = alliance
     }
 
-    public constructor(mirabufInstance: MirabufInstance, assemblyName: string, progressHandle?: ProgressHandle) {
+    public set station(station: Station | undefined) {
+        this._station = station
+    }
+
+    public get cacheId() {
+        return this._cacheId
+    }
+
+    public constructor(
+        mirabufInstance: MirabufInstance,
+        assemblyName: string,
+        progressHandle?: ProgressHandle,
+        cacheId?: string
+    ) {
         super()
 
         this._mirabufInstance = mirabufInstance
         this._assemblyName = assemblyName
+        this._cacheId = cacheId
 
         progressHandle?.update("Creating mechanism...", 0.9)
 
@@ -221,18 +242,8 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
             })
             material.depthTest = false
             this._centerOfMassIndicator = new THREE.Mesh(new THREE.SphereGeometry(0.02), material)
-            this._centerOfMassIndicator.visible = PreferencesSystem.getGlobalPreference("ShowCenterOfMassIndicators")
-
+            this._centerOfMassIndicator.visible = false
             World.sceneRenderer.scene.add(this._centerOfMassIndicator)
-
-            this._centerOfMassListenerUnsubscribe = PreferencesSystem.addPreferenceEventListener(
-                "ShowCenterOfMassIndicators",
-                e => {
-                    if (this._centerOfMassIndicator) {
-                        this._centerOfMassIndicator.visible = e.prefValue
-                    }
-                }
-            )
         }
     }
 
@@ -353,13 +364,14 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         })
         this._debugBodies?.clear()
         this._physicsLayerReserve?.release()
-        this._centerOfMassIndicator?.geometry?.dispose()
+        if (this._centerOfMassIndicator) {
+            World.sceneRenderer.scene.remove(this._centerOfMassIndicator)
+            this._centerOfMassIndicator = undefined
+        }
+
         if (this._brain && this._brain instanceof SynthesisBrain) {
             this._brain.clearControls()
         }
-        if (this._centerOfMassListenerUnsubscribe) {
-            this._centerOfMassListenerUnsubscribe()
-        }
     }
 
     public eject() {
@@ -453,6 +465,7 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         if (this._centerOfMassIndicator) {
             const netCoM = totalMass > 0 ? weightedCOM.Div(totalMass) : weightedCOM
             this._centerOfMassIndicator.position.set(netCoM.GetX(), netCoM.GetY(), netCoM.GetZ())
+            this._centerOfMassIndicator.visible = PreferencesSystem.getGlobalPreference("ShowCenterOfMassIndicators")
         }
     }
 
@@ -660,6 +673,21 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
         }
 
         this._fieldPreferences = PreferencesSystem.getFieldPreferences(this.assemblyName)
+
+        // For fields, sync devtool data with field preferences
+        if (this.miraType === MiraType.FIELD) {
+            const parts = this._mirabufInstance.parser.assembly.data?.parts
+            if (parts) {
+                const editor = new FieldMiraEditor(parts)
+                const devtoolScoringZones = editor.getUserData("devtool:scoring_zones")
+
+                if (devtoolScoringZones && Array.isArray(devtoolScoringZones)) {
+                    this._fieldPreferences.scoringZones = devtoolScoringZones
+                    PreferencesSystem.setFieldPreferences(this.assemblyName, this._fieldPreferences)
+                    PreferencesSystem.savePreferences()
+                }
+            }
+        }
     }
 
     public updateSimConfig(config: SimConfigData | undefined) {
@@ -792,15 +820,16 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
 
 export async function createMirabuf(
     assembly: mirabuf.Assembly,
-    progressHandle?: ProgressHandle
+    progressHandle?: ProgressHandle,
+    cacheId?: string
 ): Promise<MirabufSceneObject | null | undefined> {
     const parser = new MirabufParser(assembly, progressHandle)
     if (parser.maxErrorSeverity >= ParseErrorSeverity.UNIMPORTABLE) {
         console.error(`Assembly Parser produced significant errors for '${assembly.info!.name!}'`)
         return
     }
 
-    return new MirabufSceneObject(new MirabufInstance(parser), assembly.info!.name!, progressHandle)
+    return new MirabufSceneObject(new MirabufInstance(parser), assembly.info!.name!, progressHandle, cacheId)
 }
 
 /**

fission/src/systems/preferences/PreferenceTypes.ts

@@ -141,6 +141,8 @@ export type MotorPreferences = {
 
 export type Alliance = "red" | "blue"
 
+export type Station = 1 | 2 | 3
+
 export type ScoringZonePreferences = {
     name: string
     alliance: Alliance