Merge branch 'dev' into alexey/2079/command-tool

PepperLola · web-flow · commit 4319a64d1293 · 2025-08-22T17:01:26.000-07:00
diff --git a/fission/.gitignore b/fission/.gitignore
@@ -30,4 +30,6 @@ dist-ssr
 yarn.lock
 
 test-results
-src/test/**/__screenshots__
+src/test/**/__screenshots__
+
+tsconfig.tsbuildinfo
diff --git a/fission/src/mirabuf/ProtectedZoneSceneObject.ts b/fission/src/mirabuf/ProtectedZoneSceneObject.ts
@@ -2,7 +2,7 @@ import Jolt from "@azaleacolburn/jolt-physics"
 import * as THREE from "three"
 import MatchMode from "@/systems/match_mode/MatchMode"
 import { MatchModeType } from "@/systems/match_mode/MatchModeTypes"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { OnContactAddedEvent, OnContactPersistedEvent, OnContactRemovedEvent } from "@/systems/physics/ContactEvents"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import type { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"
diff --git a/fission/src/mirabuf/ScoringZoneSceneObject.ts b/fission/src/mirabuf/ScoringZoneSceneObject.ts
@@ -1,6 +1,6 @@
 import Jolt from "@azaleacolburn/jolt-physics"
 import * as THREE from "three"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { OnContactAddedEvent, OnContactRemovedEvent } from "@/systems/physics/ContactEvents"
 import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
 import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
diff --git a/fission/src/systems/World.ts b/fission/src/systems/World.ts
@@ -1,5 +1,5 @@
 import * as THREE from "three"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { PerformanceMonitoringSystem } from "@/systems/PerformanceMonitor.ts"
 import AnalyticsSystem, { type AccumTimes } from "./analytics/AnalyticsSystem"
 import InputSystem from "./input/InputSystem"
diff --git a/fission/src/systems/match_mode/MatchMode.ts b/fission/src/systems/match_mode/MatchMode.ts
@@ -3,7 +3,7 @@ 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 DefaultMatchModeConfigs from "@/systems/match_mode/DefaultMatchModeConfigs.ts"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import World from "@/systems/World.ts"
 import { globalOpenModal } from "@/ui/components/GlobalUIControls"
 import MatchResultsModal from "@/ui/modals/MatchResultsModal"
diff --git a/fission/src/systems/match_mode/RobotDimensionTracker.ts b/fission/src/systems/match_mode/RobotDimensionTracker.ts
@@ -1,5 +1,5 @@
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
-import World from "@/systems/World.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
+import World from "@/systems/World"
 import MatchMode from "./MatchMode"
 
 const BUFFER_HEIGHT = 0.1
diff --git a/fission/src/systems/match_mode/ScoreTracker.ts b/fission/src/systems/match_mode/ScoreTracker.ts
@@ -4,7 +4,7 @@ import { OnScoreChangedEvent } from "@/mirabuf/ScoringZoneSceneObject.ts"
 import type { Alliance } from "@/systems/preferences/PreferenceTypes.ts"
 import World from "@/systems/World.ts"
 
-export class ScoreTracker {
+export default class ScoreTracker {
     private static _redScore: number = 0
     private static _blueScore: number = 0
     private static _perRobotScore: Map<MirabufSceneObject, number>
diff --git a/fission/src/systems/multiplayer/MessageHandlers.ts b/fission/src/systems/multiplayer/MessageHandlers.ts
@@ -2,7 +2,7 @@ import { ProgressHandle } from "@/components/ProgressNotificationData.ts"
 import MirabufCachingService from "@/mirabuf/MirabufLoader"
 import MirabufSceneObject, { createMirabuf } from "@/mirabuf/MirabufSceneObject"
 import type { mirabuf } from "@/proto/mirabuf"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { globalAddToast } from "@/ui/components/GlobalUIControls"
 import JOLT from "@/util/loading/JoltSyncLoader"
 import MatchMode from "../match_mode/MatchMode"
diff --git a/fission/src/test/RobotDimensionsTracker.test.ts b/fission/src/test/RobotDimensionsTracker.test.ts
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import { MiraType } from "@/mirabuf/MirabufLoader"
 import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
 import RobotDimensionTracker from "@/systems/match_mode/RobotDimensionTracker"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import World from "@/systems/World"
 
 interface MockDimensions {
@@ -62,11 +62,7 @@ type RecursivePartial<T> = {
 
 vi.mock("@/systems/World", (): { default: RecursivePartial<typeof World> } => ({
     default: {
-        sceneRenderer: {
-            mirabufSceneObjects: {
-                getRobots: vi.fn(),
-            },
-        },
+        getOwnRobots: vi.fn(),
     },
 }))
 
@@ -122,10 +118,7 @@ describe("RobotDimensionTracker", () => {
             update: vi.fn(),
             dispose: vi.fn(),
         }
-        ;(World.sceneRenderer.mirabufSceneObjects.getRobots as ReturnType<typeof vi.fn>).mockReturnValue([
-            mockRobot1,
-            mockRobot2,
-        ])
+        ;(World.getOwnRobots as ReturnType<typeof vi.fn>).mockReturnValue([mockRobot1, mockRobot2])
     })
 
     afterEach(() => {
diff --git a/fission/src/test/mirabuf/FieldMiraEditor.test.ts b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
@@ -148,7 +148,7 @@ describe("Devtool Scoring Zones Caching Tests", () => {
 
 describe("Asset tests", () => {
     test("FRC Field 2018_v13 has spawn locations", async () => {
-        const file = await MirabufCachingService.cacheRemote("/api/mira/Fields/FRC Field 2018_v13.mira", MiraType.FIELD)
+        const file = await MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2018_v13.mira", MiraType.FIELD)
             .then(x => MirabufCachingService.get(x!.hash))
             .catch(e => {
                 console.error("Could not get mirabuf file", e)
diff --git a/fission/src/test/mirabuf/ProtectedZoneSceneObject.test.ts b/fission/src/test/mirabuf/ProtectedZoneSceneObject.test.ts
@@ -3,7 +3,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
 import { MiraType } from "@/mirabuf/MirabufLoader"
 import { ContactType } from "@/mirabuf/ZoneTypes"
 import { MatchModeType } from "@/systems/match_mode/MatchModeTypes"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import type { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"
 import type MirabufSceneObject from "../../mirabuf/MirabufSceneObject"
 import ProtectedZoneSceneObject from "../../mirabuf/ProtectedZoneSceneObject"
diff --git a/fission/src/test/mirabuf/ScoringZoneSceneObject.test.ts b/fission/src/test/mirabuf/ScoringZoneSceneObject.test.ts
@@ -1,6 +1,6 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import type MirabufSceneObject from "../../mirabuf/MirabufSceneObject"
 import ScoringZoneSceneObject, { OnScoreChangedEvent } from "../../mirabuf/ScoringZoneSceneObject"
 import { createBodyMock } from "../mocks/jolt"
diff --git a/fission/src/test/scene/SceneInteractionHandler.test.ts b/fission/src/test/scene/SceneInteractionHandler.test.ts
@@ -57,7 +57,7 @@ describe("ScreenInteractionHandler", () => {
         expect(mockElement.addEventListener).toHaveBeenCalledWith("pointerup", expect.any(Function))
         expect(mockElement.addEventListener).toHaveBeenCalledWith("pointercancel", expect.any(Function))
         expect(mockElement.addEventListener).toHaveBeenCalledWith("pointerleave", expect.any(Function))
-        expect(mockElement.addEventListener).toHaveBeenCalledWith("touchmove", expect.any(Function))
+        expect(mockElement.addEventListener).toHaveBeenCalledWith("touchmove", expect.any(Function), expect.any(Object))
     })
 
     test("dispose removes event listeners", () => {
diff --git a/fission/src/ui/components/Scoreboard.tsx b/fission/src/ui/components/Scoreboard.tsx
@@ -5,7 +5,7 @@ import Draggable from "react-draggable"
 import { OnScoreChangedEvent } from "@/mirabuf/ScoringZoneSceneObject"
 import MatchMode, { UpdateTimeLeft } from "@/systems/match_mode/MatchMode"
 import { MatchModeType } from "@/systems/match_mode/MatchModeTypes"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import Label from "./Label"
 
 const showTime = () => {
diff --git a/fission/src/ui/modals/MatchResultsModal.tsx b/fission/src/ui/modals/MatchResultsModal.tsx
@@ -2,7 +2,7 @@ import { Divider, Stack, styled, Typography } from "@mui/material"
 import type React from "react"
 import { useEffect } from "react"
 import MatchMode from "@/systems/match_mode/MatchMode"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { useThemeContext } from "@/ui/helpers/ThemeProviderHelpers.ts"
 import Label from "../components/Label"
 import type { ModalImplProps } from "../components/Modal"
diff --git a/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx b/fission/src/ui/panels/configuring/initial-config/InitialConfigPanel.tsx
@@ -7,7 +7,7 @@ import { getSpotlightAssembly } from "@/mirabuf/MirabufSceneObject"
 import InputSchemeManager from "@/systems/input/InputSchemeManager"
 import InputSystem from "@/systems/input/InputSystem"
 import { InputSchemeUseType } from "@/systems/input/InputTypes"
-import { ScoreTracker } from "@/systems/match_mode/ScoreTracker.ts"
+import ScoreTracker from "@/systems/match_mode/ScoreTracker"
 import { PAUSE_REF_ASSEMBLY_MOVE } from "@/systems/physics/PhysicsTypes"
 import type { Alliance, Station } from "@/systems/preferences/PreferenceTypes"
 import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
