Merge branch 'dev' into ryan/1925/camera-implementation

Author: ryanzhangofficial

fission/forge.config.ts

@@ -1,9 +1,9 @@
-import type { ForgeConfig } from "@electron-forge/shared-types"
+import { FuseV1Options, FuseVersion } from "@electron/fuses"
 import { MakerSquirrel } from "@electron-forge/maker-squirrel"
 import { MakerZIP } from "@electron-forge/maker-zip"
-import { VitePlugin } from "@electron-forge/plugin-vite"
 import { FusesPlugin } from "@electron-forge/plugin-fuses"
-import { FuseV1Options, FuseVersion } from "@electron/fuses"
+import { VitePlugin } from "@electron-forge/plugin-vite"
+import type { ForgeConfig } from "@electron-forge/shared-types"
 import path from "path"
 
 const config: ForgeConfig = {

fission/src/main.ts

@@ -1,5 +1,5 @@
-import { app, BrowserWindow } from "electron"
 import path from "node:path"
+import { app, BrowserWindow } from "electron"
 import started from "electron-squirrel-startup"
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.

fission/src/mirabuf/EjectableSceneObject.ts

@@ -80,10 +80,7 @@ class EjectableSceneObject extends SceneObject {
             World.physicsSystem.disablePhysicsForBody(this._gamePieceBodyId)
 
             // Remove from any scoring zones
-            const zones = [...World.sceneRenderer.sceneObjects.entries()]
-                .filter(x => x[1] instanceof ScoringZoneSceneObject)
-                .map(x => x[1]) as ScoringZoneSceneObject[]
-
+            const zones = World.sceneRenderer.filterSceneObjects(x => x instanceof ScoringZoneSceneObject)
             zones.forEach(x => {
                 if (this._gamePieceBodyId) ScoringZoneSceneObject.removeGamepiece(x, this._gamePieceBodyId)
             })

fission/src/mirabuf/MirabufInstance.ts

@@ -8,6 +8,25 @@ import { ParseErrorSeverity } from "./MirabufParser.ts"
 type MirabufPartInstanceGUID = string
 
 const WIREFRAME = false
+const CHROME_VERSION_FOR_INSTANCED_MESH = 139
+
+const detectInstancedMeshSupport = (): boolean => {
+    const userAgent = navigator.userAgent
+    const chromeMatch = userAgent.match(/Chrome\/(\d+)/)
+
+    if (chromeMatch) {
+        const chromeVersion = parseInt(chromeMatch[1], 10)
+        console.log(
+            `Detected Chrome ${chromeVersion}, using ${chromeVersion >= CHROME_VERSION_FOR_INSTANCED_MESH ? "InstancedMesh" : "BatchedMesh"}`
+        )
+        return chromeVersion >= CHROME_VERSION_FOR_INSTANCED_MESH
+    }
+
+    console.log(`Non-Chrome browser detected (${userAgent}), using BatchedMesh`)
+    return false
+}
+
+const USE_INSTANCED_MESH = detectInstancedMeshSupport()
 
 export enum MaterialStyle {
     REGULAR = 0,
@@ -93,8 +112,8 @@ const transformGeometry = (geometry: THREE.BufferGeometry, mesh: mirabuf.IMesh)
 class MirabufInstance {
     private _mirabufParser: MirabufParser
     private _materials: Map<string, THREE.Material>
-    private _meshes: Map<MirabufPartInstanceGUID, Array<[THREE.BatchedMesh, number]>>
-    private _batches: Array<THREE.BatchedMesh>
+    private _meshes: Map<MirabufPartInstanceGUID, Array<[THREE.InstancedMesh | THREE.BatchedMesh, number]>>
+    private _batches: Array<THREE.InstancedMesh | THREE.BatchedMesh>
 
     public get parser() {
         return this._mirabufParser
@@ -160,6 +179,63 @@ class MirabufInstance {
      * Creates ThreeJS meshes from the parsed mirabuf file.
      */
     private createMeshes() {
+        if (USE_INSTANCED_MESH) {
+            this.createInstancedMeshes()
+        } else {
+            this.createBatchedMeshes()
+        }
+    }
+
+    /**
+     * Creates InstancedMesh objects, as newer version of Chrome break with BatchedMesh
+     */
+    private createInstancedMeshes() {
+        const assembly = this._mirabufParser.assembly
+        const instances = assembly.data!.parts!.partInstances!
+
+        Object.values(instances).forEach(instance => {
+            const definition = assembly.data!.parts!.partDefinitions![instance.partDefinitionReference!]
+            const bodies = definition?.bodies ?? []
+
+            bodies.forEach(body => {
+                const mesh = body?.triangleMesh?.mesh
+                if (!mesh?.verts || !mesh.normals || !mesh.uv || !mesh.indices) return
+
+                const appearanceOverride = body.appearanceOverride
+                const material = WIREFRAME
+                    ? new THREE.MeshStandardMaterial({ wireframe: true, color: 0x000000 })
+                    : appearanceOverride && this._materials.has(appearanceOverride)
+                      ? this._materials.get(appearanceOverride)!
+                      : fillerMaterials[nextFillerMaterial++ % fillerMaterials.length]
+
+                const geometry = new THREE.BufferGeometry()
+                transformGeometry(geometry, mesh)
+
+                // Create InstancedMesh with count of 1 for this body
+                const instancedMesh = new THREE.InstancedMesh(geometry, material, 1)
+                instancedMesh.castShadow = true
+                instancedMesh.receiveShadow = true
+
+                const mat = this._mirabufParser.globalTransforms.get(instance.info!.GUID!)!
+                instancedMesh.setMatrixAt(0, mat)
+                instancedMesh.instanceMatrix.needsUpdate = true
+
+                this._batches.push(instancedMesh)
+
+                let bodies = this._meshes.get(instance.info!.GUID!)
+                if (!bodies) {
+                    bodies = []
+                    this._meshes.set(instance.info!.GUID!, bodies)
+                }
+                bodies.push([instancedMesh, 0])
+            })
+        })
+    }
+
+    /**
+     * Creates BatchedMesh, more efficient, but broken in newer versions of Chrome
+     */
+    private createBatchedMeshes() {
         const assembly = this._mirabufParser.assembly
         const instances = assembly.data!.parts!.partInstances!
 
@@ -171,6 +247,7 @@ class MirabufInstance {
 
         const batchMap = new Map<THREE.Material, Map<string, [mirabuf.IBody, Array<mirabuf.IPartInstance>]>>()
         const countMap = new Map<THREE.Material, BatchCounts>()
+
         // Filter all instances by first material, then body
         Object.values(instances).forEach(instance => {
             const definition = assembly.data!.parts!.partDefinitions![instance.partDefinitionReference!]
@@ -180,7 +257,6 @@ class MirabufInstance {
                 if (!mesh?.verts || !mesh.normals || !mesh.uv || !mesh.indices) return
 
                 const appearanceOverride = body.appearanceOverride
-
                 const material = WIREFRAME
                     ? new THREE.MeshStandardMaterial({ wireframe: true, color: 0x000000 })
                     : appearanceOverride && this._materials.has(appearanceOverride)

fission/src/mirabuf/MirabufSceneObject.ts

@@ -471,7 +471,13 @@ class MirabufSceneObject extends SceneObject implements ContextSupplier {
                 .clone()
                 .premultiply(transform)
             const meshes = this._mirabufInstance.meshes.get(part) ?? []
-            meshes.forEach(([batch, id]) => batch.setMatrixAt(id, partTransform))
+            meshes.forEach(([mesh, index]) => {
+                mesh.setMatrixAt(index, partTransform)
+                // Only update instanceMatrix for InstancedMesh
+                if ("instanceMatrix" in mesh) {
+                    mesh.instanceMatrix.needsUpdate = true
+                }
+            })
         })
     }
 

fission/src/systems/World.ts

@@ -119,8 +119,8 @@ class World {
         World._analyticsSystem?.update(this._currentDeltaT)
         World._performanceMonitorSystem?.update(this._currentDeltaT)
 
-        RobotDimensionTracker.update(World._sceneRenderer)
-        RobotPositionTracker.update(World._sceneRenderer)
+        RobotDimensionTracker.update()
+        RobotPositionTracker.update()
     }
 
     public static get currentDeltaT(): number {

fission/src/systems/match_mode/DefaultMatchModeConfigs.ts

@@ -67,6 +67,22 @@ class DefaultMatchModeConfigs {
         }
     }
 
+    static fallbackValues = (): MatchModeConfig => {
+        return {
+            id: "default",
+            name: "Default",
+            isDefault: true,
+            autonomousTime: 15,
+            teleopTime: 135,
+            endgameTime: 20,
+            ignoreRotation: true,
+            maxHeight: Infinity,
+            heightLimitPenalty: 2,
+            sideMaxExtension: Infinity,
+            sideExtensionPenalty: 2,
+        }
+    }
+
     /** @returns {MatchModeConfig[]} New copies of the default match mode configs without reference to any others. */
     public static get defaultMatchModeConfigCopies(): MatchModeConfig[] {
         return [

fission/src/systems/match_mode/MatchMode.ts

@@ -2,22 +2,13 @@ import beep from "@/assets/sound-files/beep.wav"
 import MatchEnd from "@/assets/sound-files/MatchEnd.wav"
 import MatchResume from "@/assets/sound-files/MatchResume.wav"
 import MatchStart from "@/assets/sound-files/MatchStart.wav"
-import { globalOpenModal } from "@/ui/components/GlobalUIControls"
-import MatchResultsModal from "@/ui/modals/MatchResultsModal"
+import { globalOpenModal } from "@/components/GlobalUIControls.ts"
+import MatchResultsModal from "@/modals/MatchResultsModal.tsx"
+import DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs.ts"
 import type { MatchModeConfig } from "@/ui/panels/configuring/MatchModeConfigPanel"
 import SimulationSystem from "../simulation/SimulationSystem"
 import { SoundPlayer } from "../sound/SoundPlayer"
-import {
-    DEFAULT_AUTONOMOUS_TIME,
-    DEFAULT_TELEOP_TIME,
-    DEFAULT_ENDGAME_TIME,
-    DEFAULT_IGNORE_ROTATION,
-    DEFAULT_MAX_HEIGHT,
-    DEFAULT_HEIGHT_LIMIT_PENALTY,
-    DEFAULT_SIDE_MAX_EXTENSION,
-    DEFAULT_SIDE_EXTENSION_PENALTY,
-    MatchModeType,
-} from "./MatchModeTypes"
+import { MatchModeType } from "./MatchModeTypes"
 import RobotDimensionTracker from "./RobotDimensionTracker"
 
 class MatchMode {
@@ -35,19 +26,7 @@ class MatchMode {
     private _intervalId: number | null = null
 
     // Match Mode Config
-    private _matchModeConfig: MatchModeConfig = {
-        id: "default",
-        name: "Default",
-        isDefault: true,
-        autonomousTime: DEFAULT_AUTONOMOUS_TIME,
-        teleopTime: DEFAULT_TELEOP_TIME,
-        endgameTime: DEFAULT_ENDGAME_TIME,
-        ignoreRotation: DEFAULT_IGNORE_ROTATION,
-        maxHeight: DEFAULT_MAX_HEIGHT,
-        heightLimitPenalty: DEFAULT_HEIGHT_LIMIT_PENALTY,
-        sideExtensionPenalty: DEFAULT_SIDE_EXTENSION_PENALTY,
-        sideMaxExtension: DEFAULT_SIDE_MAX_EXTENSION,
-    }
+    private _matchModeConfig: MatchModeConfig = DefaultMatchModeConfigs.fallbackValues()
 
     private constructor() {}
 

fission/src/systems/match_mode/MatchModeTypes.ts

@@ -5,13 +5,3 @@ export enum MatchModeType {
     ENDGAME = "Endgame",
     MATCH_ENDED = "Match Ended",
 }
-
-// Default match mode timing values
-export const DEFAULT_AUTONOMOUS_TIME = 15
-export const DEFAULT_TELEOP_TIME = 135
-export const DEFAULT_ENDGAME_TIME = 20
-export const DEFAULT_IGNORE_ROTATION = true
-export const DEFAULT_MAX_HEIGHT = Infinity
-export const DEFAULT_HEIGHT_LIMIT_PENALTY = 2
-export const DEFAULT_SIDE_MAX_EXTENSION = Infinity
-export const DEFAULT_SIDE_EXTENSION_PENALTY = 2

fission/src/systems/match_mode/RobotDimensionTracker.ts

@@ -1,8 +1,5 @@
-import { MiraType } from "@/mirabuf/MirabufLoader"
-import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import SimulationSystem from "@/systems/simulation/SimulationSystem"
-import World from "@/systems/World"
-import type SceneRenderer from "../scene/SceneRenderer"
+import World from "@/systems/World.ts"
 import MatchMode from "./MatchMode"
 
 const BUFFER_HEIGHT = 0.1
@@ -31,14 +28,10 @@ class RobotDimensionTracker {
         this._sideExtensionPenalty = sideExtensionPenalty
     }
 
-    public static update(sceneRenderer: SceneRenderer): void {
+    public static update(): void {
         if (!MatchMode.getInstance().isMatchEnabled()) return
 
-        const robots = [...sceneRenderer.sceneObjects.values()].filter(
-            (obj): obj is MirabufSceneObject => obj instanceof MirabufSceneObject && obj.miraType === MiraType.ROBOT
-        )
-
-        robots.forEach(robot => {
+        World.sceneRenderer.mirabufSceneObjects.getRobots().forEach(robot => {
             const dimensions = this._ignoreRotation ? robot.getDimensionsWithoutRotation() : robot.getDimensions()
 
             if (dimensions.height > this._maxHeight + BUFFER_HEIGHT) {
@@ -69,11 +62,7 @@ class RobotDimensionTracker {
         this._robotSize.clear()
         this._robotLastFramePenalty.clear()
 
-        const robots = [...World.sceneRenderer.sceneObjects.values()].filter(
-            (obj): obj is MirabufSceneObject => obj instanceof MirabufSceneObject && obj.miraType === MiraType.ROBOT
-        )
-
-        robots.forEach(robot => {
+        World.sceneRenderer.mirabufSceneObjects.getRobots().forEach(robot => {
             this._robotSize.set(robot.id, robot.getDimensions())
         })
     }