Merge branch 'dev' into colbura/261/glueball-refactors

Author: PepperLola

.github/dependabot.yml

@@ -5,3 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "nix"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.gitignore

@@ -11,3 +11,5 @@ renderer/
 .idea
 **/.direnv
 .npmrc
+result
+result-*

fission/biome.json

@@ -287,6 +287,16 @@
       "linter": {
         "enabled": false
       }
+    },
+    {
+      "includes": ["src/test/**/*"],
+      "linter": {
+        "rules": {
+          "style": {
+            "useComponentExportOnlyModules": "off"
+          }
+        }
+      }
     }
   ],
   "assist": {

fission/public/assetpack.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:929579b2dc87cffb6b5236f054a6b1ffcb17f0a384f4262f58fd2cb99fdc48ac
-size 41776301
+oid sha256:2213eb7905d6fe15beb5fca656065c248da0c4f4b7630ced943bb5cf4a32c3fb
+size 43082276

fission/src/Synthesis.tsx

@@ -11,7 +11,6 @@ import { UIRenderer } from "@/ui/UIRenderer.tsx"
 import PreferencesSystem from "./systems/preferences/PreferencesSystem.ts"
 import AnalyticsConsent from "./ui/components/AnalyticsConsent.tsx"
 import ContextMenu from "./ui/components/ContextMenu.tsx"
-import DragModeIndicator from "@/components/overlays/DragModeIndicator.tsx"
 import ProgressNotifications from "@/components/ProgressNotification.tsx"
 import SceneOverlay from "@/components/overlays/SceneOverlay.tsx"
 import PortraitOverlay from "@/components/overlays/PortraitOverlay.tsx"
@@ -109,7 +108,6 @@ const Synthesis = () => {
                             <CommandPalette />
                             <ProgressNotifications key={"progress-notifications"} />
                             <Stack direction={"column"} gap={1} position={"absolute"} bottom={0} left={0}>
-                                <DragModeIndicator />
                                 <MultiplayerHUD />
                             </Stack>
                             <PortraitOverlay />

fission/src/systems/EventSystem.ts

@@ -49,8 +49,9 @@ interface EventDataMap {
     SetPlaceAssetButtonVisibleEvent: boolean
     ToggleTouchControlsVisibilityEvent: never
     SetTouchControlsVisibilityEvent: boolean
+    TouchControlsVisibilityChangedEvent: { visible: boolean }
 
-    DragModeToggled: { enabled: boolean }
+    SetDragModeEvent: { enabled: boolean }
 
     CameraModeChangedEvent: { mode: string }
     CameraFocusChangedEvent: { focusProvider: MirabufSceneObject | undefined }

fission/src/systems/match_mode/DefaultMatchModeConfigs.ts

@@ -1,7 +1,7 @@
 import type { MatchModeConfig } from "@/ui/panels/configuring/MatchModeConfigPanel"
 import { API_URL } from "@/util/Consts.ts"
 
-type ManifestMatchModeConfig = Omit<MatchModeConfig, "id"> & { id: string }
+type ManifestMatchModeConfig = Omit<MatchModeConfig, "id">
 interface MatchConfigManifest {
     private: Record<string, ManifestMatchModeConfig>
     public: Record<string, ManifestMatchModeConfig>
@@ -12,32 +12,40 @@ class DefaultMatchModeConfigs {
     private static readonly MANIFEST_LOCATION = `${API_URL}/match_configs/manifest.json`
     private static _configs: MatchModeConfig[] = []
 
-    static {
-        setTimeout(() => this.reload())
+    private static _loading: Promise<void> | undefined
+
+    static reload(): Promise<void> {
+        this._loading = this.load()
+        return this._loading
     }
-    static async reload() {
-        const manifest = await fetch(this.MANIFEST_LOCATION)
-        const json: MatchConfigManifest | undefined = await manifest.json().catch(e => {
-            console.error(e)
-            return undefined
-        })
-        if (json == null) {
-            console.error("Could not load match mode manifest")
-            return undefined
+
+    private static async load(): Promise<void> {
+        const configs = await this.fetchConfigs()
+        if (configs) {
+            this._configs = configs
         }
-        const keys: (keyof MatchConfigManifest)[] = import.meta.env.DEV
-            ? (["public", "private"] as const)
-            : (["public"] as const)
-        for (const key of keys) {
-            const configs = json[key as keyof MatchConfigManifest]
-            Object.entries(configs).forEach(([key, value]) => {
-                value.id = key
-                this._configs.push(value)
-            })
+    }
+
+    private static async fetchConfigs(): Promise<MatchModeConfig[] | undefined> {
+        try {
+            const response = await fetch(this.MANIFEST_LOCATION)
+            const manifest: MatchConfigManifest | undefined = await response.json()
+            if (manifest == undefined) {
+                console.error("Could not load match mode manifest")
+                return undefined
+            }
+
+            const keys: (keyof MatchConfigManifest)[] = import.meta.env.DEV ? ["public", "private"] : ["public"]
+            return keys.flatMap(key => Object.entries(manifest[key] ?? {}).map(([id, config]) => ({ ...config, id })))
+        } catch (e) {
+            console.error("Could not load match mode manifest", e)
+            return undefined
         }
     }
 
-    public static get configs(): MatchModeConfig[] {
+    public static async getConfigs(): Promise<MatchModeConfig[]> {
+        this._loading ??= this.load()
+        await this._loading
         return this._configs
     }
 

fission/src/systems/preferences/PreferenceTypes.ts

@@ -15,7 +15,7 @@ export type UserPreferences = {
     RenderProtectedZones: boolean
     InputSchemes: InputScheme[]
     RenderSceneTags: boolean
-    RenderScoreboard: boolean
+    AlwaysShowScoreboard: boolean
     SubsystemGravity: boolean
     TouchControls: boolean
     SimAutoReconnect: boolean
@@ -57,7 +57,7 @@ export function defaultUserPreferences(): UserPreferences {
         RenderProtectedZones: true,
         InputSchemes: [],
         RenderSceneTags: true,
-        RenderScoreboard: false,
+        AlwaysShowScoreboard: true,
         SubsystemGravity: false,
         TouchControls: false,
         SimAutoReconnect: false,

fission/src/systems/scene/DragModeSystem.ts

@@ -92,7 +92,7 @@ class DragModeSystem extends WorldSystem {
                 this.handleWheelDuringDrag(event)
             }
         }
-        this._unsubscriber = EventSystem.listen("DragModeToggled", ({ enabled }) => {
+        this._unsubscriber = EventSystem.listen("SetDragModeEvent", ({ enabled }) => {
             this.enabled = enabled
         })
     }
@@ -101,6 +101,7 @@ class DragModeSystem extends WorldSystem {
         return this._enabled
     }
 
+    /** toggle using SetDragModeEvent. Not this */
     public set enabled(enabled: boolean) {
         if (this._enabled === enabled) return
 
@@ -123,8 +124,6 @@ class DragModeSystem extends WorldSystem {
                 this._dragModeStartTime = undefined
             }
         }
-
-        EventSystem.dispatch("DragModeToggled", { enabled })
     }
 
     public update(_deltaT: number): void {
@@ -358,8 +357,22 @@ class DragModeSystem extends WorldSystem {
     private stopDragging(): void {
         if (!this._isDragging) return
 
+        let targetSceneObject: MirabufSceneObject | undefined
+        let shouldTransition = true
+
+        if (this._dragTarget) {
+            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
+            targetSceneObject = association?.sceneObject
+            if (association?.isGamePiece) {
+                shouldTransition = false
+            }
+        }
+
         if (this._dragTarget?.physicsDisabled) {
-            World.physicsSystem.enablePhysicsForBody(this._dragTarget.bodyId)
+            World.physicsSystem.enablePhysicsForBody(
+                this._dragTarget.bodyId,
+                targetSceneObject?.mechanism.layerReserve?.layer
+            )
         } else if (this._dragTarget) {
             const body = World.physicsSystem.getBody(this._dragTarget.bodyId)
             if (body) {
@@ -387,17 +400,6 @@ class DragModeSystem extends WorldSystem {
             }
         }
 
-        let targetSceneObject: MirabufSceneObject | undefined
-        let shouldTransition = true
-
-        if (this._dragTarget) {
-            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
-            targetSceneObject = association?.sceneObject
-            if (association?.isGamePiece) {
-                shouldTransition = false
-            }
-        }
-
         this._isDragging = false
         this._dragTarget = undefined
 
@@ -428,6 +430,9 @@ class DragModeSystem extends WorldSystem {
             World.physicsSystem.activateBody(this._dragTarget.bodyId)
         }
 
+        const compensateGravity =
+            DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION && !this._dragTarget.physicsDisabled
+
         const currentPos = body.GetPosition()
         const currentPosition = new THREE.Vector3(currentPos.GetX(), currentPos.GetY(), currentPos.GetZ())
         const currentRotation = body.GetRotation()
@@ -509,7 +514,7 @@ class DragModeSystem extends WorldSystem {
             const forceNeeded = velocityError.multiplyScalar(forceMultiplier)
 
             // Add gravity compensation to counteract downward pull
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensation = new THREE.Vector3(
                     0,
                     mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE,
@@ -559,7 +564,7 @@ class DragModeSystem extends WorldSystem {
             )
 
             // Add gravity compensation to prevent falling when stationary
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensationY = mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE
                 brakingForce.SetY(brakingForce.GetY() + gravityCompensationY)
             }

fission/src/test/PreferencesSystem.test.ts

@@ -25,17 +25,17 @@ describe("Preferences System Global Values", () => {
     test("Setting values", () => {
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", 7)
         PreferencesSystem.setUserPreference("RenderSceneTags", false)
-        PreferencesSystem.setUserPreference("RenderScoreboard", false)
+        PreferencesSystem.setUserPreference("ShowViewCube", false)
 
         expect(PreferencesSystem.getUserPreference("SceneRotationSensitivity")).toBe(7)
         expect(PreferencesSystem.getUserPreference("RenderSceneTags")).toBe(false)
-        expect(PreferencesSystem.getUserPreference("RenderScoreboard")).toBe(false)
+        expect(PreferencesSystem.getUserPreference("ShowViewCube")).toBe(false)
     })
 
     test("Setting without saving", () => {
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", 13)
         PreferencesSystem.setUserPreference("RenderSceneTags", false)
-        PreferencesSystem.setUserPreference("RenderScoreboard", true)
+        PreferencesSystem.setUserPreference("ShowViewCube", false)
 
         window.localStorage.setItem("Preferences", "{}") // Clears local storage
         PreferencesSystem.loadPreferences()
@@ -46,31 +46,31 @@ describe("Preferences System Global Values", () => {
     test("Reset to default if undefined", () => {
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", undefined as unknown as number)
         PreferencesSystem.setUserPreference("RenderSceneTags", undefined as unknown as boolean)
-        PreferencesSystem.setUserPreference("RenderScoreboard", undefined as unknown as boolean)
+        PreferencesSystem.setUserPreference("ShowViewCube", undefined as unknown as boolean)
 
         expectDefaultPreferences()
     })
 
     test("Setting then saving", () => {
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", 13)
         PreferencesSystem.setUserPreference("RenderSceneTags", true)
-        PreferencesSystem.setUserPreference("RenderScoreboard", false)
+        PreferencesSystem.setUserPreference("ShowViewCube", false)
 
         PreferencesSystem.savePreferences()
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", 20)
         PreferencesSystem.setUserPreference("RenderSceneTags", false)
-        PreferencesSystem.setUserPreference("RenderScoreboard", true)
+        PreferencesSystem.setUserPreference("ShowViewCube", true)
         PreferencesSystem.loadPreferences()
 
         expect(PreferencesSystem.getUserPreference("SceneRotationSensitivity")).toBe(13)
         expect(PreferencesSystem.getUserPreference("RenderSceneTags")).toBe(true)
-        expect(PreferencesSystem.getUserPreference("RenderScoreboard")).toBe(false)
+        expect(PreferencesSystem.getUserPreference("ShowViewCube")).toBe(false)
     })
 
     test("Clearing preferences", () => {
         PreferencesSystem.setUserPreference("SceneRotationSensitivity", 13)
         PreferencesSystem.setUserPreference("RenderSceneTags", true)
-        PreferencesSystem.setUserPreference("RenderScoreboard", false)
+        PreferencesSystem.setUserPreference("ShowViewCube", false)
 
         PreferencesSystem.clearPreferences()