Merge branch 'dev' into alexey/102/export-some-mira

Author: PepperLola

.github/workflows/NixTest.yml

@@ -0,0 +1,43 @@
+name: Test Nix
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  nix-flake-check:
+    name: Nix Flake Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+
+      - uses: cachix/install-nix-action@v31
+
+      - name: Nix Flake Check
+        run: nix flake check
+
+  fission-playwright:
+    name: Fission Playwright
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+
+      - uses: cachix/install-nix-action@v31
+
+      - name: Cache Node Dependencies
+        uses: actions/cache@v6
+        with:
+          key: "${{runner.os}}-npm-fission-${{hashFiles('fission/bun.lock')}}"
+          path: "fission/node_modules"
+          restore-keys: |
+            ${{runner.os}}-npm-fission-
+            ${{runner.os}}-npm
+
+      - name: Install Dependencies
+        working-directory: "fission"
+        run: nix develop .#fission --command bash -c "bun install --frozen-lockfile"
+      
+      - name: Run Playwright Tests
+        working-directory: "fission"
+        run: |
+          nix develop .#fission --command bash -c "bun run test run ./src/test/APSTesting.test.ts"

NOTICE.txt

@@ -18,4 +18,8 @@ This product bundles the following third-party sound assets:
 
    For more information, contact FIRST Robotics or refer to your licensing agreement.
 
-This product also includes Autodesk brand marks. See MARKS-LICENSE.md for more information.
+3. Files licensed from WPILib:
+   - simulation/SyntheSimJava/src/main/java/com/autodesk/synthesis/cscore/CameraServer.java
+   - simulation/SyntheSimJava/src/main/java/com/autodesk/synthesis/cscore/CvSink.java
+
+This product also includes Autodesk brand marks. See MARKS-LICENSE.md for more information.

fission/biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.5.6/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",
@@ -26,7 +26,7 @@
       "react": "all"
     },
     "rules": {
-      "recommended": false,
+      "preset": "none",
       "complexity": {
         "noAdjacentSpacesInRegex": "error",
         "noBannedTypes": "error",
@@ -72,6 +72,7 @@
         "useAsConstAssertion": "error",
         "useComponentExportOnlyModules": "warn",
         "useImportType": "warn",
+        "useConsistentArrayType": "error",
         "useNamingConvention": {
           "level": "error",
           "options": {
@@ -238,7 +239,8 @@
         "noUnsafeNegation": "error",
         "noWith": "error",
         "useGetterReturn": "error",
-        "noTsIgnore": "error"
+        "noTsIgnore": "error",
+        "noArrayIndexKey": "warn"
       }
     },
     "includes": ["src/**/*.{ts,tsx,js,json}", "./*.{ts,js,json,html}"]
@@ -264,6 +266,11 @@
       "selfCloseVoidElements": "always"
     }
   },
+  "css": {
+    "parser": {
+      "tailwindDirectives": true
+    }
+  },
   "overrides": [
     {
       "includes": ["*.json"],

fission/bun.lock

@@ -31,7 +31,7 @@
     "postinstall": "bun run lockfile:clean | bun x dev-null"
   },
   "dependencies": {
-    "@biomejs/biome": "^2.2.0",
+    "@biomejs/biome": "^2.5.6",
     "@haensl/google-analytics": "^1.2.2",
     "@mui/base": "^5.0.0-beta.70",
     "@mui/icons-material": "^5.18.0",
@@ -47,6 +47,7 @@
     "fuse.js": "^7.1.0",
     "jszip": "^3.10.1",
     "lygia": "^1.3.3",
+    "meshoptimizer": "^1.2.0",
     "msw": "^2.10.5",
     "notistack": "^3.0.2",
     "peerjs": "^1.5.5",

fission/package.json

@@ -1,6 +1,6 @@
 @import "tailwindcss";
 
-@config '../tailwind.config.mjs';
+@config "../tailwind.config.mjs";
 
 /*
   The default border color has changed to `currentcolor` in Tailwind CSS v4,

fission/src/index.css

@@ -115,7 +115,7 @@ class IntakeSensorSceneObject extends SceneObject {
 
     public dispose(): void {
         if (this._joltBodyId) {
-            World.physicsSystem.destroyBodyIds(this._joltBodyId)
+            World.physicsSystem.destroyBodiesById(this._joltBodyId)
         }
 
         this._collisionUnsubscriber?.()

fission/src/mirabuf/IntakeSensorSceneObject.ts

@@ -93,8 +93,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, [THREE.BatchedMesh, number][]>
+    private _batches: THREE.BatchedMesh[]
 
     public get parser() {
         return this._mirabufParser
@@ -174,7 +174,7 @@ class MirabufInstance {
             maxIndices: number
         }
 
-        const batchMap = new Map<THREE.Material, Map<string, [mirabuf.IBody, Array<mirabuf.IPartInstance>]>>()
+        const batchMap = new Map<THREE.Material, Map<string, [mirabuf.IBody, mirabuf.IPartInstance[]]>>()
         const countMap = new Map<THREE.Material, BatchCounts>()
 
         // Filter all instances by first material, then body
@@ -194,7 +194,7 @@ class MirabufInstance {
 
                 let materialBodyMap = batchMap.get(material)
                 if (!materialBodyMap) {
-                    materialBodyMap = new Map<string, [mirabuf.IBody, Array<mirabuf.IPartInstance>]>()
+                    materialBodyMap = new Map<string, [mirabuf.IBody, mirabuf.IPartInstance[]]>()
                     batchMap.set(material, materialBodyMap)
                 }
 

fission/src/mirabuf/MirabufInstance.ts

@@ -8,7 +8,7 @@ import InitialConfigPanel from "@/panels/configuring/initial-config/InitialConfi
 import { PAUSE_REF_ASSEMBLY_SPAWNING } from "@/systems/physics/PhysicsTypes.ts"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject.ts"
 import { getTargetControls } from "@/systems/scene/CameraControls.ts"
-import type { EncodedAssembly, LocalSceneObjectId, Message, RemoteSceneObjectId } from "@/systems/multiplayer/types.ts"
+import type { EncodedAssembly, Message } from "@/systems/multiplayer/types.ts"
 import { ProgressHandle } from "@/components/ProgressNotificationData.ts"
 
 const MIRABUF_LOCALSTORAGE_GENERATION_KEY = "Synthesis Nonce Key"
@@ -496,7 +496,7 @@ export async function spawnCachedMira(
                         type: "newObject",
                         timestamp: Date.now(),
                         data: {
-                            sceneObjectKey: mirabufSceneObject.id as RemoteSceneObjectId,
+                            sceneObjectKey: mirabufSceneObject.id,
                             assembly: encodedAssembly,
                             assemblyHash: info.hash,
                             miraType: info.miraType,
@@ -505,15 +505,15 @@ export async function spawnCachedMira(
                         },
                     }
                     await World.multiplayerSystem?.broadcast(message)
-                    World.multiplayerSystem?.registerOwnSceneObject(mirabufSceneObject.id as LocalSceneObjectId)
+                    World.multiplayerSystem?.registerOwnSceneObject(mirabufSceneObject.id)
                 }
 
                 if (targetControls && (info.miraType === MiraType.ROBOT || !targetControls.focusProvider)) {
                     targetControls.focusProvider = mirabufSceneObject
                 }
 
                 progressHandle.done()
-
+                World.physicsSystem.deactivateGamepieces()
                 if (mirabufSceneObject.miraType == MiraType.ROBOT) {
                     globalOpenPanel(InitialConfigPanel, undefined)
                 }

fission/src/mirabuf/MirabufLoader.ts

@@ -26,15 +26,15 @@ class MirabufParser {
     private _nodeNameCounter: number = 0
 
     private _assembly: mirabuf.Assembly
-    private _errors: Array<ParseError>
+    private _errors: ParseError[]
     private _directedGraph: Graph
     private _rootNode: string
 
     protected _partTreeValues: Map<string, number> = new Map()
     private _designHierarchyRoot: mirabuf.INode = new mirabuf.Node()
 
     protected _partToNodeMap: Map<string, RigidNode> = new Map()
-    protected _rigidNodes: Array<RigidNode> = []
+    protected _rigidNodes: RigidNode[] = []
     private _globalTransforms: Map<string, THREE.Matrix4>
 
     private _groundedNode: RigidNode | undefined