diff --git a/fission/package.json b/fission/package.json index 126efa86f7..bee97c517b 100644 --- a/fission/package.json +++ b/fission/package.json @@ -16,7 +16,7 @@ "build:prod": "tsc && vite build --base=/fission/", "assetpack": "run-script-os", "assetpack:nix": "curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && unzip -o public/assetpack.zip -d public/", - "assetpack:win32": "echo todo" + "assetpack:win32": "curl -o public/assetpack.zip https://synthesis.autodesk.com/Downloadables/assetpack.zip && tar -xf public/assetpack.zip -C public/" }, "dependencies": { "@barclah/jolt-physics": "^0.19.3", diff --git a/fission/prettier.config.js b/fission/prettier.config.js index 11920b1227..1ab6c97d3c 100644 --- a/fission/prettier.config.js +++ b/fission/prettier.config.js @@ -9,7 +9,15 @@ const config = { bracketSpacing: true, bracketSameLine: false, arrowParens: "avoid", - printWidth: 120 + printWidth: 120, + overrides: [ + { + files: "*.json", + options: { + tabWidth: 2, + }, + }, + ], } -export default config; +export default config diff --git a/fission/src/Synthesis.tsx b/fission/src/Synthesis.tsx index 261efc1615..c6d0fb9a39 100644 --- a/fission/src/Synthesis.tsx +++ b/fission/src/Synthesis.tsx @@ -1,9 +1,9 @@ -import Scene from '@/components/Scene.tsx'; -import MirabufSceneObject from './mirabuf/MirabufSceneObject.ts'; -import { LoadMirabufRemote } from './mirabuf/MirabufLoader.ts'; -import { mirabuf } from './proto/mirabuf'; -import MirabufParser, { ParseErrorSeverity } from './mirabuf/MirabufParser.ts'; -import MirabufInstance from './mirabuf/MirabufInstance.ts'; +import Scene from "@/components/Scene.tsx" +import MirabufSceneObject from "./mirabuf/MirabufSceneObject.ts" +import { LoadMirabufRemote } from "./mirabuf/MirabufLoader.ts" +import { mirabuf } from "./proto/mirabuf" +import MirabufParser, { ParseErrorSeverity } from "./mirabuf/MirabufParser.ts" +import MirabufInstance from "./mirabuf/MirabufInstance.ts" import { AnimatePresence } from "framer-motion" import { ReactElement, useEffect } from "react" import { ModalControlProvider, useModalManager } from "@/ui/ModalContext" @@ -49,10 +49,10 @@ import ScoringZonesPanel from "@/panels/configuring/scoring/ScoringZonesPanel" import ZoneConfigPanel from "@/panels/configuring/scoring/ZoneConfigPanel" import ScoreboardPanel from "@/panels/information/ScoreboardPanel" import DriverStationPanel from "@/panels/simulation/DriverStationPanel" -import ManageAssembliesModal from '@/modals/spawning/ManageAssembliesModal.tsx'; -import World from '@/systems/World.ts'; -import { AddRobotsModal, AddFieldsModal, SpawningModal } from '@/modals/spawning/SpawningModals.tsx'; -import ImportMirabufModal from '@/modals/mirabuf/ImportMirabufModal.tsx'; +import ManageAssembliesModal from "@/modals/spawning/ManageAssembliesModal.tsx" +import World from "@/systems/World.ts" +import { AddRobotsModal, AddFieldsModal, SpawningModal } from "@/modals/spawning/SpawningModals.tsx" +import ImportMirabufModal from "@/modals/mirabuf/ImportMirabufModal.tsx" const DEFAULT_MIRA_PATH = "/api/mira/Robots/Team 2471 (2018)_v7.mira" diff --git a/fission/src/mirabuf/MirabufParser.ts b/fission/src/mirabuf/MirabufParser.ts index 7936f8ca44..1d503f5623 100644 --- a/fission/src/mirabuf/MirabufParser.ts +++ b/fission/src/mirabuf/MirabufParser.ts @@ -191,7 +191,7 @@ class MirabufParser { // Build undirected graph const graph = new Graph() graph.AddNode(rootNode ? rootNode.id : this._rigidNodes[0].id) - const jointInstances = (Object.values(assembly.data!.joints!.jointInstances!) as mirabuf.joint.JointInstance[]) + const jointInstances = Object.values(assembly.data!.joints!.jointInstances!) as mirabuf.joint.JointInstance[] jointInstances.forEach((x: mirabuf.joint.JointInstance) => { const rA = this._partToNodeMap.get(x.parentPart) const rB = this._partToNodeMap.get(x.childPart) diff --git a/fission/src/ui/ToastContext.tsx b/fission/src/ui/ToastContext.tsx index 2730f7001f..a6ee866b88 100644 --- a/fission/src/ui/ToastContext.tsx +++ b/fission/src/ui/ToastContext.tsx @@ -1,10 +1,4 @@ -import React, { - createContext, - useState, - useContext, - useCallback, - ReactNode, -} from "react" +import React, { createContext, useState, useContext, useCallback, ReactNode } from "react" import Toast from "@/components/Toast" import { AnimatePresence, motion } from "framer-motion" diff --git a/fission/src/ui/components/Dropdown.tsx b/fission/src/ui/components/Dropdown.tsx index ab26a92236..05b684d4a0 100644 --- a/fission/src/ui/components/Dropdown.tsx +++ b/fission/src/ui/components/Dropdown.tsx @@ -39,9 +39,10 @@ const Dropdown: React.FC = ({ label, options, onSelect }) => {