Merge branch 'dev' into alexey/2054/button-sounds-fix

Author: AlexD717

.github/workflows/FissionBuild.yml

@@ -35,3 +35,8 @@ jobs:
         run: |
           cd fission
           bun run build && echo "Build Passed" || (echo "Build Failed" && exit 1)
+
+      - name: Build Electron Version of Fission
+        run: |
+          cd fission
+          bun run electron:make && echo "Build Passed" || (echo "Build Failed" && exit 1)

fission/electron/vite.renderer.config.ts

@@ -1,5 +1,8 @@
-import { defineConfig, mergeConfig } from "vite"
+import { defineConfig, mergeConfig, type UserConfig } from "vite"
 import baseConfig from "../vite.config"
 
 // https://vitejs.dev/config
-export default defineConfig((env) => mergeConfig(baseConfig(env), {}))
+export default defineConfig(async (env) => {
+    const base = typeof baseConfig === 'function' ? await baseConfig(env) : baseConfig
+    return mergeConfig(base, {} as UserConfig)
+})

fission/package.json

@@ -22,6 +22,7 @@
     "style": "bun run fmt && bun run lint",
     "style:fix": "bun run fmt:fix && bun run lint:fix",
     "assetpack": "git lfs pull && tar -xf public/assetpack.zip -C public/",
+    "assetpack:update": "cd public && zip -FS -r assetpack.zip Downloadables",
     "playwright:install": "bun x playwright install",
     "electron:start": "electron-forge start",
     "electron:package": "electron-forge package",

fission/public/assetpack.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:985ef0918d3b8200fc076cc31d9af0199b08586e45fda4ecc716555a01660fee
-size 193149510
+oid sha256:23bfaf7899d84b00331c12bf1ada20d27d3c50856b14bb5733821b44848812ba
+size 193147860

fission/src/mirabuf/FieldMiraEditor.ts

@@ -1,10 +1,15 @@
-import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
-import { mirabuf } from "../proto/mirabuf"
+import type MirabufSceneObject from "@/mirabuf/MirabufSceneObject.ts"
+import { mirabuf } from "@/proto/mirabuf"
+import {
+    defaultFieldPreferences,
+    type FieldPreferences,
+    type ScoringZonePreferences,
+} from "@/systems/preferences/PreferenceTypes"
 
-interface DevtoolMiraData {
+export interface DevtoolMiraData {
     "devtool:scoring_zones": ScoringZonePreferences[]
     "devtool:camera_locations": unknown
-    "devtool:spawn_points": unknown
+    "devtool:spawn_locations": FieldPreferences["spawnLocations"]
     "devtool:a": unknown
     "devtool:b": unknown
     "devtool:test": unknown
@@ -15,6 +20,87 @@ interface DevtoolMiraData {
     // additional devtool keys to be added in future
 }
 
+export const devtoolHandlers = {
+    "devtool:scoring_zones": {
+        get(field) {
+            return field.fieldPreferences?.scoringZones ?? defaultFieldPreferences().scoringZones
+        },
+        set(field, val) {
+            val ??= defaultFieldPreferences().scoringZones
+            if (!field.fieldPreferences || !this.validate(val)) {
+                console.warn("validation failed", val, field.fieldPreferences)
+                return
+            }
+            field.fieldPreferences.scoringZones = val
+            field.updateScoringZones()
+        },
+        validate(val): val is ScoringZonePreferences[] {
+            if (!Array.isArray(val)) return false
+            return val.every(
+                z =>
+                    typeof z === "object" &&
+                    z !== null &&
+                    typeof z.name === "string" &&
+                    (z.alliance === "red" || z.alliance === "blue") &&
+                    (typeof z.parentNode === "string" || z.parentNode === undefined) &&
+                    typeof z.points === "number" &&
+                    typeof z.destroyGamepiece === "boolean" &&
+                    typeof z.persistentPoints === "boolean" &&
+                    Array.isArray(z.deltaTransformation)
+            )
+        },
+    },
+    "devtool:spawn_locations": {
+        get(field) {
+            return field.fieldPreferences?.spawnLocations ?? defaultFieldPreferences().spawnLocations
+        },
+        set(field, val) {
+            val ??= defaultFieldPreferences().spawnLocations
+            if (!field.fieldPreferences || !this.validate(val)) {
+                console.warn("validation failed", val, field.fieldPreferences)
+                return
+            }
+            field.fieldPreferences.spawnLocations = val
+        },
+        validate(val: unknown): val is FieldPreferences["spawnLocations"] {
+            const isStructureCorrect =
+                typeof val === "object" &&
+                val != null &&
+                "red" in val &&
+                "blue" in val &&
+                "default" in val &&
+                "hasConfiguredLocations" in val
+
+            if (!isStructureCorrect) return false
+            return (["red", "blue"] as const).every(v => {
+                const obj = val[v]
+                if (!(typeof obj === "object" && obj != null && 1 in obj && 2 in obj && 3 in obj)) return false
+                return ([1, 2, 3] as const).every(v => {
+                    const spawnposition = obj[v]
+                    return (
+                        typeof spawnposition == "object" &&
+                        spawnposition != null &&
+                        "pos" in spawnposition &&
+                        "yaw" in spawnposition &&
+                        Array.isArray(spawnposition["pos"]) &&
+                        spawnposition["pos"].length == 3 &&
+                        typeof spawnposition["yaw"] == "number"
+                    )
+                })
+            })
+        },
+    },
+} as const satisfies Partial<{
+    [K in keyof DevtoolMiraData]: {
+        get(field: MirabufSceneObject): DevtoolMiraData[K]
+        set(field: MirabufSceneObject, val: unknown | null): void
+        validate(val: unknown): val is DevtoolMiraData[K]
+    }
+}>
+
+export type DevtoolKey = keyof typeof devtoolHandlers
+export const devtoolKeys = Object.keys(devtoolHandlers) as DevtoolKey[]
+
 /**
  * Utility for reading and writing developer tool data in the mira file's UserData field.
  * Docs: https://www.mirabuf.dev/#mirabuf.UserData

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)