-
)
+ }
+}
\ No newline at end of file
diff --git a/fission/src/mirabuf/MirabufSceneObject.ts b/fission/src/mirabuf/MirabufSceneObject.ts
index 588a89b8c6..34a98b539c 100644
--- a/fission/src/mirabuf/MirabufSceneObject.ts
+++ b/fission/src/mirabuf/MirabufSceneObject.ts
@@ -12,7 +12,7 @@ import { LayerReserve } from "@/systems/physics/PhysicsSystem";
import Mechanism from "@/systems/physics/Mechanism";
import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain";
-const DEBUG_BODIES = false;
+const DEBUG_BODIES = true;
interface RnDebugMeshes {
colliderMesh: THREE.Mesh;
diff --git a/fission/src/modals/mirabuf/ImportMirabufModal.tsx b/fission/src/modals/mirabuf/ImportMirabufModal.tsx
new file mode 100644
index 0000000000..564976cdd0
--- /dev/null
+++ b/fission/src/modals/mirabuf/ImportMirabufModal.tsx
@@ -0,0 +1,121 @@
+import React, { useEffect, useState } from "react"
+import Modal, { ModalPropsImpl } from "../../components/Modal"
+import { FaPlus } from "react-icons/fa6"
+import Button from "@/components/Button";
+import Label, { LabelSize } from "@/components/Label";
+import { Data, Folder, Hub, Item, Project, getFolderData, getHubs, getProjects } from "@/aps/APSDataManagement";
+
+interface ItemCardProps {
+ id: string;
+ name: string;
+ buttonText: string;
+ onClick: () => void;
+}
+
+const ItemCard: React.FC = ({ id, name, buttonText, onClick }) => {
+ return (
+ = ({ modalId }) => {
+ // update tooltip based on type of drivetrain, receive message from Synthesis
+ // const { showTooltip } = useTooltipControlContext()
+
+ const [selectedHub, setSelectedHub] = useState(undefined)
+ const [selectedProject, setSelectedProject] = useState(undefined)
+ const [selectedFolder, setSelectedFolder] = useState(undefined)
+
+ const [hubs, setHubs] = useState(undefined)
+ useEffect(() => {
+ (async () => {
+ setHubs(await getHubs())
+ })()
+ }, [])
+
+ const [projects, setProjects] = useState(undefined)
+ useEffect(() => {
+ (async () => {
+ if (selectedHub) {
+ setProjects(await getProjects(selectedHub))
+ }
+ })()
+ }, [selectedHub])
+
+ const [folderData, setFolderData] = useState(undefined)
+ useEffect(() => {
+ (async () => {
+ if (selectedProject) {
+ console.log('Project has been selected')
+ if (selectedFolder) {
+ console.log(`Selecting folder '${selectedFolder.displayName}'`)
+
+ setFolderData(await getFolderData(selectedProject, selectedFolder))
+ } else {
+ console.log('Defaulting to project root folder')
+ const data = await getFolderData(selectedProject, selectedProject.folder)
+ console.log(`Folder Data:\n${JSON.stringify(data)}`)
+ setFolderData(data)
+ }
+ }
+ })()
+ }, [selectedProject, selectedFolder])
+
+ useEffect(() => {
+ if (folderData) {
+ console.log(`${folderData.length} items in folder data`)
+ } else {
+ console.log('No folder data')
+ }
+ }, [folderData])
+
+ return (
+ ());
- // const json = JSON.stringify(dozer);
- // console.log(json);
- // });
-
- test('Test Load TestCube_v1.mira (Uncompressed)', () => {
- const testCubeMira = LoadMirabufLocal('./public/test_mira/TestCube_v1.mira');
-
- expect(testCubeMira).toBeDefined();
- expect(testCubeMira.info!.name!).toBe('TestCube v1');
- });
-
- test('Test Load FRC_Field_2018_v14.mira (Compressed)', () => {
- const field = LoadMirabufLocal('./public/test_mira/FRC_Field_2018_v14.mira');
-
- expect(field).toBeDefined();
- expect(field.info!.name!).toBe('FRC Field 2018 v14');
- });
-
- test('Generate Rigid Nodes (TestCube_v1.mira)', () => {
- const testCubeMira = LoadMirabufLocal('./public/test_mira/TestCube_v1.mira');
-
- const parser = new MirabufParser(testCubeMira);
- const rn = parser.rigidNodes;
-
- expect(filterNonPhysicsNodes(rn, testCubeMira).length).toBe(1);
- // printRigidNodeParts(rn, testCubeMira);
- });
-
- test('Generate Rigid Nodes (Dozer_v2.mira)', () => {
- const spikeMira = LoadMirabufLocal('./public/test_mira/Dozer_v2.mira');
+ test('Generate Rigid Nodes (Dozer_v9.mira)', () => {
+ const spikeMira = LoadMirabufLocal('./public/Downloadables/Mira/Robots/Dozer_v9.mira');
const t = new MirabufParser(spikeMira);
const rn = t.rigidNodes;
expect(filterNonPhysicsNodes(rn, spikeMira).length).toBe(7);
- // printRigidNodeParts(rn, spikeMira);
- });
-
- test('Generate Rigid Nodes (PhysicsSpikeTest_v1.mira)', () => {
- const spikeMira = LoadMirabufLocal('./public/test_mira/PhysicsSpikeTest_v1.mira');
-
- const t = new MirabufParser(spikeMira);
- const rn = t.rigidNodes;
-
- expect(filterNonPhysicsNodes(rn, spikeMira).length).toBe(4);
- // printRigidNodeParts(rn, spikeMira);
});
test('Generate Rigid Nodes (FRC_Field_2018_v14.mira)', () => {
- const field = LoadMirabufLocal('./public/test_mira/FRC_Field_2018_v14.mira');
+ const field = LoadMirabufLocal('./public/Downloadables/Mira/Fields/FRC Field 2018_v13.mira');
const t = new MirabufParser(field);
- // printRigidNodeParts(t.rigidNodes, field);
expect(filterNonPhysicsNodes(t.rigidNodes, field).length).toBe(34);
});
test('Generate Rigid Nodes (Team_2471_(2018)_v7.mira)', () => {
- const mm = LoadMirabufLocal('./public/test_mira/Team_2471_(2018)_v7.mira');
+ const mm = LoadMirabufLocal('./public/Downloadables/Mira/Robots/Team 2471 (2018)_v7.mira');
const t = new MirabufParser(mm);
- // printRigidNodeParts(t.rigidNodes, mm);
expect(filterNonPhysicsNodes(t.rigidNodes, mm).length).toBe(10);
});
});
diff --git a/fission/src/test/PhysicsSystem.test.ts b/fission/src/test/PhysicsSystem.test.ts
index 0efeb05f34..71246ece9b 100644
--- a/fission/src/test/PhysicsSystem.test.ts
+++ b/fission/src/test/PhysicsSystem.test.ts
@@ -66,7 +66,7 @@ describe('Physics Sansity Checks', () => {
describe('Mirabuf Physics Loading', () => {
test('Body Loading (Dozer)', () => {
- const assembly = LoadMirabufLocal('./public/test_mira/Dozer_v2.mira');
+ const assembly = LoadMirabufLocal('./public/Downloadables/Mira/Robots/Dozer_v9.mira');
const parser = new MirabufParser(assembly);
const physSystem = new PhysicsSystem();
const mapping = physSystem.CreateBodiesFromParser(parser, new LayerReserve());
@@ -75,7 +75,7 @@ describe('Mirabuf Physics Loading', () => {
});
test('Body Loading (Team_2471_(2018)_v7.mira)', () => {
- const assembly = LoadMirabufLocal('./public/test_mira/Team_2471_(2018)_v7.mira');
+ const assembly = LoadMirabufLocal('./public/Downloadables/Mira/Robots/Team 2471 (2018)_v7.mira');
const parser = new MirabufParser(assembly);
const physSystem = new PhysicsSystem();
const mapping = physSystem.CreateBodiesFromParser(parser, new LayerReserve());
diff --git a/fission/src/test/aps/APS.test.ts b/fission/src/test/aps/APS.test.ts
new file mode 100644
index 0000000000..3e7da5f219
--- /dev/null
+++ b/fission/src/test/aps/APS.test.ts
@@ -0,0 +1,40 @@
+import APS from "@/aps/APS";
+import { describe, expect, test } from "vitest";
+
+describe('APS', () => {
+ test('Generate Random Strings (10)', () => {
+ const s = APS.genRandomString(10);
+
+ (async () => {
+ const [v, c] = await APS.codeChallenge()
+ console.log(`${v}`)
+ console.log(`${c}`)
+ })()
+
+ expect(s.length).toBe(10)
+ const matches = s.match(/^([0-9a-z])*$/i)
+ expect(matches).toBeDefined()
+ expect(matches!.length).toBeGreaterThanOrEqual(1)
+ expect(matches![0]).toBe(s)
+ })
+
+ test('Generate Random Strings (50)', () => {
+ const s = APS.genRandomString(50)
+
+ expect(s.length).toBe(50)
+ const matches = s.match(/^([0-9a-z])*$/i)
+ expect(matches).toBeDefined()
+ expect(matches!.length).toBeGreaterThanOrEqual(1)
+ expect(matches![0]).toBe(s)
+ })
+
+ test('Generate Random Strings (75)', () => {
+ const s = APS.genRandomString(75)
+
+ expect(s.length).toBe(75)
+ const matches = s.match(/^([0-9a-z])*$/i)
+ expect(matches).toBeDefined()
+ expect(matches!.length).toBeGreaterThanOrEqual(1)
+ expect(matches![0]).toBe(s)
+ })
+})
\ No newline at end of file
diff --git a/fission/src/util/Utility.ts b/fission/src/util/Utility.ts
new file mode 100644
index 0000000000..d6234cb0c9
--- /dev/null
+++ b/fission/src/util/Utility.ts
@@ -0,0 +1,3 @@
+export function ternaryOnce(obj: A | undefined, ifTrue: (x: A) => B, ifFalse: () => B): B {
+ return obj ? ifTrue(obj) : ifFalse()
+}
\ No newline at end of file
diff --git a/fission/tailwind.config.js b/fission/tailwind.config.js
index cff09dd793..f68ff1ef70 100644
--- a/fission/tailwind.config.js
+++ b/fission/tailwind.config.js
@@ -52,6 +52,9 @@ export default {
},
spacing: {
'20vw': '20vw',
+ },
+ aspectRatio: {
+ 'toast': '6.44 / 1.0'
}
},
},
diff --git a/fission/vite.config.ts b/fission/vite.config.ts
index 6e973509c7..478da1046d 100644
--- a/fission/vite.config.ts
+++ b/fission/vite.config.ts
@@ -1,7 +1,11 @@
-import { defineConfig } from 'vite'
+import { defineConfig } from 'vitest/config'
import * as path from 'path'
import react from '@vitejs/plugin-react-swc'
+const basePath = '/fission/'
+const serverPort = 3000
+const dockerServerPort = 3003
+
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react(), /* viteSingleFile() */],
@@ -10,22 +14,32 @@ export default defineConfig({
{ find: '@', replacement: path.resolve(__dirname, 'src') }
]
},
- server: {
+ test: {
+ globals: true,
+ environment: 'jsdom'
+ },
+ server: {
// this ensures that the browser opens upon server start
open: true,
- // this sets a default port to 3000
- port: 3000,
+ // this sets a default port to 3000
+ port: serverPort,
cors: false,
proxy: {
'/api/mira': {
- target: 'https://synthesis.autodesk.com/Downloadables/Mira',
+ target: `http://localhost:${serverPort}${basePath}`,
changeOrigin: true,
secure: false,
- rewrite: (path) => path.replace(/^\/api\/mira/, '')
+ rewrite: (path) => path.replace(/^\/api\/mira/, '/Downloadables/Mira')
+ },
+ '/api/auth': {
+ target: `http://localhost:${dockerServerPort}/`,
+ changeOrigin: true,
+ secure: false
}
},
},
build: {
- target: 'esnext'
- }
+ target: 'esnext',
+ },
+ base: basePath
})
{icon}
-
-
)
diff --git a/fission/src/components/UserIcon.tsx b/fission/src/components/UserIcon.tsx
new file mode 100644
index 0000000000..4fce62d302
--- /dev/null
+++ b/fission/src/components/UserIcon.tsx
@@ -0,0 +1,22 @@
+import APS, { APS_USER_INFO_UPDATE_EVENT } from "@/aps/APS";
+import { useEffect, useState } from "react";
+import { FaQuestion } from "react-icons/fa";
+
+interface UserIconProps {
+ className: string;
+}
+
+export function UserIcon({ className }: UserIconProps) {
+
+ const [userInfo, setUserInfo] = useState(APS.userInfo)
+
+ useEffect(() => {
+ document.addEventListener(APS_USER_INFO_UPDATE_EVENT, () => setUserInfo(APS.userInfo))
+ }, [])
+
+ if (!userInfo) {
+ return ({title}
-{description}
+
+
+
+
+
+ {title}
+{description}
+
+
+
+
+ )
+}
+
+const ImportMirabufModal: React.FC
+ {
+ selectedHub
+ ? selectedFolder
+ ? <>
+
+ {
+ !selectedHub
+ ? hubs?.map(x => ItemCard({ name: x.name, id: x.id, buttonText: '>', onClick: () => setSelectedHub(x) }))
+ : !selectedProject
+ ? projects?.map(x => ItemCard({ name: x.name, id: x.id, buttonText: '>', onClick: () => setSelectedProject(x) }))
+ : folderData?.map(x => x instanceof Folder
+ ? ItemCard({ name: `DIR: ${x.displayName}`, id: x.id, buttonText: '>', onClick: () => setSelectedFolder(x) })
+ : x instanceof Item
+ ? ItemCard({ name: `${x.displayName}`, id: x.id, buttonText: 'import', onClick: () => { console.log(`Selecting ${x.displayName} (${x.id})`) } })
+ : ItemCard({ name: `${x.type}: ${x.id}`, id: x.id, buttonText: '---', onClick: () => { console.log(`Selecting (${x.id})`) } })
+ )
+ }
+
+
+ )
+}
+
+export default ImportMirabufModal
\ No newline at end of file
diff --git a/fission/src/systems/physics/PhysicsSystem.ts b/fission/src/systems/physics/PhysicsSystem.ts
index 235b3abb75..d6d8256385 100644
--- a/fission/src/systems/physics/PhysicsSystem.ts
+++ b/fission/src/systems/physics/PhysicsSystem.ts
@@ -674,7 +674,6 @@ export class LayerReserve {
public constructor() {
this._layer = RobotLayers.shift()!
- console.log(`Layer ${this._layer} Popped`)
this._isReleased = false
}
@@ -682,7 +681,6 @@ export class LayerReserve {
if (!this._isReleased) {
RobotLayers.push(this._layer);
this._isReleased = true;
- console.log(`Layer ${this._layer} Released`)
}
}
}
diff --git a/fission/src/systems/scene/SceneRenderer.ts b/fission/src/systems/scene/SceneRenderer.ts
index 94cd545b36..daaf2fdf4f 100644
--- a/fission/src/systems/scene/SceneRenderer.ts
+++ b/fission/src/systems/scene/SceneRenderer.ts
@@ -3,6 +3,7 @@ import SceneObject from './SceneObject';
import WorldSystem from '../WorldSystem';
const CLEAR_COLOR = 0x121212;
+const GROUND_COLOR = 0x73937E
let nextSceneObjectId = 1;
@@ -74,7 +75,7 @@ class SceneRenderer extends WorldSystem {
const ambientLight = new THREE.AmbientLight(0xffffff, 0.1);
this._scene.add(ambientLight);
- const ground = new THREE.Mesh(new THREE.BoxGeometry(10, 1, 10), this.CreateToonMaterial(CLEAR_COLOR));
+ const ground = new THREE.Mesh(new THREE.BoxGeometry(10, 1, 10), this.CreateToonMaterial(GROUND_COLOR));
ground.position.set(0.0, -2.0, 0.0);
ground.receiveShadow = true;
ground.castShadow = true;
@@ -106,9 +107,6 @@ class SceneRenderer extends WorldSystem {
obj.id = id;
this._sceneObjects.set(id, obj);
obj.Setup();
-
- console.debug(obj);
-
return id;
}
diff --git a/fission/src/test/MirabufParser.test.ts b/fission/src/test/MirabufParser.test.ts
index 93a0b3b2d7..881471d42f 100644
--- a/fission/src/test/MirabufParser.test.ts
+++ b/fission/src/test/MirabufParser.test.ts
@@ -5,72 +5,28 @@ import MirabufParser, { RigidNodeReadOnly } from "../mirabuf/MirabufParser";
import { LoadMirabufLocal } from "../mirabuf/MirabufLoader";
describe('Mirabuf Parser Tests', () => {
- // test('Get Dozer JSON', () => {
- // const dozer = LoadMirabufLocal('./public/test_mira/Dozer_v2.mira');
- // Object.values(dozer.data!.parts!.partDefinitions!).forEach(x => x.bodies = new Array