Skip to content

Commit cf2312e

Browse files
itspvtyitspvty
committed
Merge branch 'dev' into aries/1896/scoreboard-ui
2 parents 13ce5e6 + dec000d commit cf2312e

File tree

73 files changed

+1037
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1037
-1022
lines changed

‎.github/workflows/FissionUnitTest.yml‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runUnitTests:
1212
name: Playwright Unit Tests
1313
container:
14-
image: mcr.microsoft.com/playwright:v1.54.0-noble
14+
image: mcr.microsoft.com/playwright:v1.54.2-noble
1515
runs-on: ubuntu-latest
1616
defaults:
1717
run:
@@ -57,3 +57,41 @@ jobs:
5757

5858
- name: Run Tests
5959
run: HOME=/root npm run test
60+
61+
runAssetpackTests:
62+
name: Assetpack Tests
63+
needs: runUnitTests
64+
container:
65+
image: mcr.microsoft.com/playwright:v1.54.2-noble
66+
runs-on: ubuntu-latest
67+
defaults:
68+
run:
69+
working-directory: "fission"
70+
steps:
71+
- name: Checkout Code
72+
uses: actions/checkout@v4
73+
- name: JavaScript Setup
74+
uses: actions/setup-node@v4
75+
with:
76+
node-version: 20
77+
78+
- name: Cache Unzipped Synthesis Assets
79+
id: cache-assets
80+
uses: actions/cache@v3
81+
with:
82+
path: fission/public/Downloadables
83+
key: ${{ runner.os }}-assets-${{hashFiles('fission/public/assetpack.zip')}}
84+
85+
- name: Cache Node Dependencies
86+
uses: actions/cache@v3
87+
with:
88+
key: "${{runner.os}}-npm-fission-${{hashFiles('fission/package.json')}}"
89+
path: "fission/node_modules"
90+
restore-keys: |
91+
${{runner.os}}-npm-fission-
92+
${{runner.os}}-npm
93+
94+
- name: Run Assetpack Tests
95+
run: HOME=/root npm run test src/test/mirabuf/DefaultAssets.test.ts
96+
env:
97+
VITE_RUN_ASSETPACK_TEST: true

‎exporter/SynthesisFusionAddin/web/src/App.tsx‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useCallback, useEffect, useState } from "react"
22

33
import "./App.css"
4-
import { RestartAlt, Settings, SportsFootball, Texture } from "@mui/icons-material"
4+
import { RestartAlt, Settings, SportsFootball } from "@mui/icons-material"
55
import DownloadIcon from "@mui/icons-material/Download"
66
import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
77
import SaveIcon from "@mui/icons-material/Save"
@@ -36,7 +36,7 @@ import GamepiecesConfigTab from "./ui/GamepiecesConfigTab.tsx"
3636
import GeneralConfigTab from "./ui/GeneralConfigTab.tsx"
3737
import GlobalAlert from "./ui/GlobalAlert.tsx"
3838
import JointsConfigTab from "./ui/JointsConfigTab.tsx"
39-
import MaterialTaggingTab, { type TaggedBody } from "./ui/MaterialTaggingTab.tsx"
39+
import type { TaggedBody } from "./ui/MaterialTaggingTab.tsx"
4040

4141
function TabPanel(props: { children?: React.ReactNode; value: number; index: number }) {
4242
const { children, value, index, ...other } = props
@@ -179,7 +179,11 @@ function App() {
179179
return (
180180
<ThemeProvider theme={theme}>
181181
<Backdrop
182-
sx={theme => ({ color: "#fff", zIndex: theme.zIndex.drawer + 1, backdropFilter: "blur(0px)" })}
182+
sx={theme => ({
183+
color: "#fff",
184+
zIndex: theme.zIndex.drawer + 1,
185+
backdropFilter: "blur(0px)",
186+
})}
183187
open={isSelecting}
184188
onClick={() => {
185189
Global_SetAlert(
@@ -227,7 +231,7 @@ function App() {
227231
disabled={generalConfig.exportMode === ExportMode.ROBOT}
228232
/>
229233

230-
<Tab icon={<Texture />} iconPosition={"start"} label="Materials" />
234+
{/*<Tab icon={<Texture />} iconPosition={"start"} label="Materials" />*/}
231235

232236
{/*<Tab label="APS" />*/}
233237
</Tabs>
@@ -252,13 +256,13 @@ function App() {
252256
selection={{ isSelecting, setIsSelecting }}
253257
/>
254258
</TabPanel>
255-
<TabPanel value={activeTab} index={3}>
256-
<MaterialTaggingTab
257-
tags={taggedBodies}
258-
updateTags={updateTaggedBodies}
259-
selection={{ isSelecting, setIsSelecting }}
260-
/>
261-
</TabPanel>
259+
{/*<TabPanel value={activeTab} index={3}>*/}
260+
{/* <MaterialTaggingTab*/}
261+
{/* tags={taggedBodies}*/}
262+
{/* updateTags={updateTaggedBodies}*/}
263+
{/* selection={{ isSelecting, setIsSelecting }}*/}
264+
{/* />*/}
265+
{/*</TabPanel>*/}
262266
<Container
263267
sx={{
264268
position: "sticky",

‎exporter/SynthesisFusionAddin/web/src/ui/GeneralConfigTab.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import AnimationIcon from "@mui/icons-material/Animation"
22
import ArchiveIcon from "@mui/icons-material/Archive"
33
import BalanceIcon from "@mui/icons-material/Balance"
44
import LaunchIcon from "@mui/icons-material/Launch"
5-
import PrecisionManufacturingIcon from "@mui/icons-material/PrecisionManufacturing"
65
import SaveIcon from "@mui/icons-material/Save"
76
import TuneIcon from "@mui/icons-material/Tune"
87
import {
@@ -135,13 +134,14 @@ function GeneralConfigTab({ config, updateConfigItem }: ConfigTabProps): React.R
135134
<Switch edge="end" onChange={updateLiteral("compressOutput")} checked={config.compressOutput} />
136135
</ListItem>
137136
<Collapse in={config.exportMode === ExportMode.ROBOT}>
138-
<ListItem>
139-
<ListItemIcon>
140-
<PrecisionManufacturingIcon />
141-
</ListItemIcon>
142-
<ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />
143-
<Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />
144-
</ListItem>
137+
{/* TODO: enable when mix and match is created */}
138+
{/*<ListItem>*/}
139+
{/* <ListItemIcon>*/}
140+
{/* <PrecisionManufacturingIcon />*/}
141+
{/* </ListItemIcon>*/}
142+
{/* <ListItemText primary="Export as Part" secondary="Use to export as a part for Mix And Match" />*/}
143+
{/* <Switch edge="end" onChange={updateLiteral("exportAsPart")} checked={config.exportAsPart} />*/}
144+
{/*</ListItem>*/}
145145
<ListItem>
146146
<ListItemIcon>
147147
<TuneIcon />

‎exporter/SynthesisFusionAddin/web/src/ui/JointsConfigTab.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
207207
/>
208208

209209
<h4>
210-
{joints.filter(j => j.isWheel).length} Wheel{joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
210+
{joints.filter(j => j.isWheel).length} Wheel
211+
{joints.filter(j => j.isWheel).length !== 1 ? "s" : ""}
211212
</h4>
212213
<TableContainer component={Paper} elevation={6}>
213214
<Table sx={{ minWidth: 650 }} aria-label="simple table">
@@ -241,8 +242,8 @@ function JointsConfigTab({ joints, updateJoints, selection }: JointsConfigTabPro
241242
fullWidth
242243
>
243244
<MenuItem value={WheelType.STANDARD}>Standard</MenuItem>
244-
<MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>
245-
<MenuItem value={WheelType.OMNI}>Omni</MenuItem>
245+
{/*<MenuItem value={WheelType.MECANUM}>Mecanum</MenuItem>*/}
246+
{/*<MenuItem value={WheelType.OMNI}>Omni</MenuItem>*/}
246247
</Select>
247248
</TableCell>
248249
</TableRow>

‎fission/biome.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,5 +179,5 @@
179179
{ "includes": ["src/proto/**/*"], "linter": { "enabled": false } }
180180
],
181181

182-
"assist": { "enabled": true, "actions": { "source": { "organizeImports": "on" } } }
182+
"assist": { "enabled": true, "actions": { "source": { "organizeImports": "off" } } }
183183
}

‎fission/manifest.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export type ManifestFileType = Record<"robots"|"private"|"fields", { filename: string, hash: string }[]>

‎fission/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"build:prod": "tsc && vite build --base=/fission/ --outDir dist/prod",
1616
"build:dev": "tsc && vite build --base=/fission-closed/ --outDir dist/dev",
1717
"preview": "vite preview --base=/fission/",
18-
"lint": "bunx --bun biome lint",
19-
"lint:fix": "bunx --bun biome lint --fix",
20-
"fmt": "bunx --bun biome format src",
21-
"fmt:fix": "bunx --bun biome format src --write",
22-
"style": "bun run fmt && bun run lint",
23-
"style:fix": "bun run fmt:fix && bun run lint:fix",
24-
"assetpack": "git lfs pull && tar -xf public/assetpack.zip -C public/",
25-
"assetpack:update": "cd public && zip -FS -r assetpack.zip Downloadables",
18+
"lint": "bunx biome lint",
19+
"lint:fix": "bunx biome lint --write",
20+
"fmt": "bunx biome format src",
21+
"fmt:fix": "bunx biome format src --write",
22+
"style": "bunx biome check src",
23+
"style:fix": "bunx biome check src --write",
24+
"assetpack": "git lfs pull && (rm -rf public/Downloadables;tar -xf public/assetpack.zip -C public/)",
25+
"assetpack:update": "bun update_manifest.ts && cd public && zip -FS -r assetpack.zip Downloadables",
2626
"playwright:install": "bun x playwright install",
2727
"electron:start": "electron-forge start",
2828
"electron:package": "electron-forge package",

‎fission/public/assetpack.zip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:23bfaf7899d84b00331c12bf1ada20d27d3c50856b14bb5733821b44848812ba
3-
size 193147860
2+
oid sha256:bc65215352491eacaf6090792280cfe8d3a4be4cf48100583d4044af7f54e12e
3+
size 72047181

‎fission/src/Window.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ declare interface Window {
22
convertAuthToken(code: string): void
33
gtag?: (command: "config" | "set" | "get" | "event" | "consent", ...args: unknown[]) => void
44
dataLayer?: unknown[][]
5+
World?: unknown
56
}

‎fission/src/main.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ import "./index.css"
44
import APS from "./aps/APS"
55

66
window.convertAuthToken = code => APS.convertAuthToken(code)
7-
87
ReactDOM.createRoot(document.getElementById("root")!).render(<Synthesis />)

0 commit comments

Comments
 (0)