= ({ modalId }) => {
icon={}
modalId={modalId}
onAccept={() => {
- // showTooltip("controls", [
- // { control: "WASD", description: "Drive" },
- // { control: "E", description: "Intake" },
- // { control: "Q", description: "Dispense" },
- // ]);
- }
- }
+ // showTooltip("controls", [
+ // { control: "WASD", description: "Drive" },
+ // { control: "E", description: "Intake" },
+ // { control: "Q", description: "Dispense" },
+ // ]);
+ }}
>
- {
- 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) })
+ {!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})`) } })
- )
- }
+ ? 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})`)
+ },
+ })
+ )}
)
diff --git a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
index 7ae40b40c2..3031aec4c9 100644
--- a/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
+++ b/fission/src/ui/modals/spawning/ManageAssembliesModal.tsx
@@ -1,23 +1,29 @@
import React, { useReducer } 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 World from "@/systems/World";
-import MirabufSceneObject from "@/mirabuf/MirabufSceneObject";
+import Button from "@/components/Button"
+import Label, { LabelSize } from "@/components/Label"
+import World from "@/systems/World"
+import MirabufSceneObject from "@/mirabuf/MirabufSceneObject"
interface AssemblyCardProps {
- id: number;
- update: React.DispatchWithoutAction;
+ id: number
+ update: React.DispatchWithoutAction
}
const AssemblyCard: React.FC = ({ id, update }) => {
return (
-
+
)
@@ -27,9 +33,14 @@ const ManageAssembliesModal: React.FC
= ({ modalId }) => {
// update tooltip based on type of drivetrain, receive message from Synthesis
// const { showTooltip } = useTooltipControlContext()
- const [_, update] = useReducer((x) => !x, false)
+ const [_, update] = useReducer(x => !x, false)
- const assemblies = [...World.SceneRenderer.sceneObjects.entries()].filter(x => { const y = (x[1] instanceof MirabufSceneObject); return y }).map(x => x[0])
+ const assemblies = [...World.SceneRenderer.sceneObjects.entries()]
+ .filter(x => {
+ const y = x[1] instanceof MirabufSceneObject
+ return y
+ })
+ .map(x => x[0])
return (
= ({ modalId }) => {
icon={}
modalId={modalId}
onAccept={() => {
- // showTooltip("controls", [
- // { control: "WASD", description: "Drive" },
- // { control: "E", description: "Intake" },
- // { control: "Q", description: "Dispense" },
- // ]);
- }
- }
+ // showTooltip("controls", [
+ // { control: "WASD", description: "Drive" },
+ // { control: "E", description: "Intake" },
+ // { control: "Q", description: "Dispense" },
+ // ]);
+ }}
>
-
- {
- assemblies.map(x => AssemblyCard({id: x, update: update}))
- }
+
+ {assemblies.map(x => AssemblyCard({ id: x, update: update }))}
)
diff --git a/fission/src/ui/modals/spawning/SpawningModals.tsx b/fission/src/ui/modals/spawning/SpawningModals.tsx
index 3e716adc69..25d25efba2 100644
--- a/fission/src/ui/modals/spawning/SpawningModals.tsx
+++ b/fission/src/ui/modals/spawning/SpawningModals.tsx
@@ -10,23 +10,23 @@ import World from "@/systems/World"
import { useTooltipControlContext } from "@/ui/TooltipContext"
interface MirabufEntry {
- displayName: string;
- src: string;
+ displayName: string
+ src: string
}
interface MirabufCardProps {
- entry: MirabufEntry;
- select: (entry: MirabufEntry) => void;
+ entry: MirabufEntry
+ select: (entry: MirabufEntry) => void
}
const MirabufCard: React.FC = ({ entry, select }) => {
return (
-
+
-
)
}
@@ -35,23 +35,31 @@ export const AddRobotsModal: React.FC
= ({ modalId }) => {
const { showTooltip } = useTooltipControlContext()
const { closeModal } = useModalControlContext()
- const [remoteRobots, setRemoteRobots] = useState(null);
+ const [remoteRobots, setRemoteRobots] = useState(null)
useEffect(() => {
(async () => {
- fetch('/api/mira/manifest.json').then(x => x.json()).then(x => {
- const robots: MirabufEntry[] = [];
- for (const src of x['robots']) {
- if (typeof(src) == 'string') {
- robots.push({ src: `/api/mira/Robots/${src}`, displayName: src })
- } else {
- robots.push({ src: src['src'], displayName: src['displayName'] })
+ fetch("/api/mira/manifest.json")
+ .then(x => x.json())
+ .then(x => {
+ const robots: MirabufEntry[] = []
+ for (const src of x["robots"]) {
+ if (typeof src == "string") {
+ robots.push({
+ src: `/api/mira/Robots/${src}`,
+ displayName: src,
+ })
+ } else {
+ robots.push({
+ src: src["src"],
+ displayName: src["displayName"],
+ })
+ }
}
- }
- setRemoteRobots(robots)
- })
+ setRemoteRobots(robots)
+ })
})()
- }, []);
+ }, [])
const selectRobot = (entry: MirabufEntry) => {
console.log(`Mira: '${entry.src}'`)
@@ -71,19 +79,12 @@ export const AddRobotsModal: React.FC = ({ modalId }) => {
}
return (
- }
- modalId={modalId}
- acceptEnabled={false}
- >
+ } modalId={modalId} acceptEnabled={false}>
-
- {
- remoteRobots
- ? remoteRobots!.map(x => MirabufCard({entry: x, select: selectRobot}))
- : (<>)
- }
+
+ {remoteRobots ? remoteRobots!.map(x => MirabufCard({ entry: x, select: selectRobot })) : <>}
)
@@ -92,23 +93,31 @@ export const AddRobotsModal: React.FC = ({ modalId }) => {
export const AddFieldsModal: React.FC = ({ modalId }) => {
const { closeModal } = useModalControlContext()
- const [remoteFields, setRemoteFields] = useState(null);
+ const [remoteFields, setRemoteFields] = useState(null)
useEffect(() => {
(async () => {
- fetch('/api/mira/manifest.json').then(x => x.json()).then(x => {
- const fields: MirabufEntry[] = [];
- for (const src of x['fields']) {
- if (typeof(src) == 'string') {
- fields.push({ src: `/api/mira/Fields/${src}`, displayName: src })
- } else {
- fields.push({ src: src['src'], displayName: src['displayName'] })
+ fetch("/api/mira/manifest.json")
+ .then(x => x.json())
+ .then(x => {
+ const fields: MirabufEntry[] = []
+ for (const src of x["fields"]) {
+ if (typeof src == "string") {
+ fields.push({
+ src: `/api/mira/Fields/${src}`,
+ displayName: src,
+ })
+ } else {
+ fields.push({
+ src: src["src"],
+ displayName: src["displayName"],
+ })
+ }
}
- }
- setRemoteFields(fields)
- })
+ setRemoteFields(fields)
+ })
})()
- }, []);
+ }, [])
const selectField = (entry: MirabufEntry) => {
console.log(`Mira: '${entry.src}'`)
@@ -122,19 +131,12 @@ export const AddFieldsModal: React.FC = ({ modalId }) => {
}
return (
- }
- modalId={modalId}
- acceptEnabled={false}
- >
+ } modalId={modalId} acceptEnabled={false}>
-
- {
- remoteFields
- ? remoteFields!.map(x => MirabufCard({entry: x, select: selectField}))
- : (<>)
- }
+
+ {remoteFields ? remoteFields!.map(x => MirabufCard({ entry: x, select: selectField })) : <>}
)
diff --git a/fission/src/ui/panels/RobotSwitchPanel.tsx b/fission/src/ui/panels/RobotSwitchPanel.tsx
index e440053589..d32ecba3f4 100644
--- a/fission/src/ui/panels/RobotSwitchPanel.tsx
+++ b/fission/src/ui/panels/RobotSwitchPanel.tsx
@@ -7,15 +7,18 @@ import Button from "@/components/Button"
import { useModalControlContext } from "@/ui/ModalContext"
import Checkbox from "@/components/Checkbox"
-const RobotSwitchPanel: React.FC = ({ panelId }) => {
- const [robots, setRobots] = useState([
- "Dozer_v9_0",
- "Team 2471 (2018) v7_0",
- ])
+const RobotSwitchPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
+ const [robots, setRobots] = useState(["Dozer_v9_0", "Team 2471 (2018) v7_0"])
const [selected, setSelected] = useState(0)
const { openModal } = useModalControlContext()
return (
- } panelId={panelId}>
+ }
+ panelId={panelId}
+ openLocation={openLocation}
+ sidePadding={sidePadding}
+ >
)
diff --git a/fission/src/ui/panels/SpawnLocationPanel.tsx b/fission/src/ui/panels/SpawnLocationPanel.tsx
index 9e4a58f449..60b5718a18 100644
--- a/fission/src/ui/panels/SpawnLocationPanel.tsx
+++ b/fission/src/ui/panels/SpawnLocationPanel.tsx
@@ -2,7 +2,7 @@ import { useTooltipControlContext } from "@/ui/TooltipContext"
import Button from "@/components/Button"
import Panel, { PanelPropsImpl } from "@/components/Panel"
-const SpawnLocationsPanel: React.FC = ({ panelId }) => {
+const SpawnLocationsPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
const robotsPerAlliance = 3
const alliances = 2
@@ -13,7 +13,7 @@ const SpawnLocationsPanel: React.FC = ({ panelId }) => {
])
return (
-
+
{Array(alliances)
@@ -25,13 +25,9 @@ const SpawnLocationsPanel: React.FC = ({ panelId }) => {
.map((o: number, j: number) => (
|
|
))}
diff --git a/fission/src/ui/panels/configuring/ConfigureGamepiecePickupPanel.tsx b/fission/src/ui/panels/configuring/ConfigureGamepiecePickupPanel.tsx
index 97345d453b..534f9a54ab 100644
--- a/fission/src/ui/panels/configuring/ConfigureGamepiecePickupPanel.tsx
+++ b/fission/src/ui/panels/configuring/ConfigureGamepiecePickupPanel.tsx
@@ -4,9 +4,7 @@ import Panel, { PanelPropsImpl } from "@/components/Panel"
import SelectButton from "@/components/SelectButton"
import Slider from "@/components/Slider"
-const ConfigureGamepiecePickupPanel: React.FC = ({
- panelId,
-}) => {
+const ConfigureGamepiecePickupPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
const defaultZoneSize = 0.5
const [, setNode] = useState("Click to select")
const [, setZoneSize] = useState(defaultZoneSize)
@@ -16,6 +14,8 @@ const ConfigureGamepiecePickupPanel: React.FC = ({
name="Configure Pickup"
icon={}
panelId={panelId}
+ openLocation={openLocation}
+ sidePadding={sidePadding}
onAccept={() => {
// send zone config
}}
diff --git a/fission/src/ui/panels/configuring/ConfigureShotTrajectoryPanel.tsx b/fission/src/ui/panels/configuring/ConfigureShotTrajectoryPanel.tsx
index 2955bd35cc..29f493200b 100644
--- a/fission/src/ui/panels/configuring/ConfigureShotTrajectoryPanel.tsx
+++ b/fission/src/ui/panels/configuring/ConfigureShotTrajectoryPanel.tsx
@@ -4,9 +4,7 @@ import Panel, { PanelPropsImpl } from "@/components/Panel"
import SelectButton from "@/components/SelectButton"
import Slider from "@/components/Slider"
-const ConfigureShotTrajectoryPanel: React.FC = ({
- panelId,
-}) => {
+const ConfigureShotTrajectoryPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
const defaultShootSpeed = 5
const [, setNode] = useState("Click to select")
const [, setShootSpeed] = useState(defaultShootSpeed)
@@ -16,6 +14,8 @@ const ConfigureShotTrajectoryPanel: React.FC = ({
name="Configure Shooting"
icon={}
panelId={panelId}
+ openLocation={openLocation}
+ sidePadding={sidePadding}
onAccept={() => {
// send node and speed config
}}
diff --git a/fission/src/ui/panels/configuring/scoring/ScoringZonesPanel.tsx b/fission/src/ui/panels/configuring/scoring/ScoringZonesPanel.tsx
index c0aeaf7a76..f2f2bf32fb 100644
--- a/fission/src/ui/panels/configuring/scoring/ScoringZonesPanel.tsx
+++ b/fission/src/ui/panels/configuring/scoring/ScoringZonesPanel.tsx
@@ -13,42 +13,19 @@ type ScoringZoneRowProps = {
deleteZone: () => void
}
-const ScoringZoneRow: React.FC = ({
- zone,
- openPanel,
- deleteZone,
-}) => {
+const ScoringZoneRow: React.FC = ({ zone, openPanel, deleteZone }) => {
return (
-
-
-
-
+
+
+
+
-
+
@@ -56,7 +33,7 @@ const ScoringZoneRow: React.FC = ({
)
}
-const ScoringZonesPanel: React.FC = ({ panelId }) => {
+const ScoringZonesPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
const { openPanel } = usePanelControlContext()
const [zones, setZones] = useState([
{
@@ -227,6 +204,8 @@ const ScoringZonesPanel: React.FC = ({ panelId }) => {
@@ -242,11 +221,7 @@ const ScoringZonesPanel: React.FC = ({ panelId }) => {
/>
))}
-
)
}
diff --git a/fission/src/ui/panels/configuring/scoring/ZoneConfigPanel.tsx b/fission/src/ui/panels/configuring/scoring/ZoneConfigPanel.tsx
index e92c73d689..4fe84b26cf 100644
--- a/fission/src/ui/panels/configuring/scoring/ZoneConfigPanel.tsx
+++ b/fission/src/ui/panels/configuring/scoring/ZoneConfigPanel.tsx
@@ -5,6 +5,7 @@ import Button from "@/components/Button"
import SelectButton from "@/components/SelectButton"
import Checkbox from "@/components/Checkbox"
import Slider from "@/components/Slider"
+import NumberInput from "@/components/NumberInput"
export type ScoringZone = {
name: string
@@ -16,7 +17,7 @@ export type ScoringZone = {
scale: [number, number, number]
}
-const ZoneConfigPanel: React.FC = ({ panelId }) => {
+const ZoneConfigPanel: React.FC = ({ panelId, openLocation, sidePadding }) => {
// somehow get and store which zone is being edited
// maybe a global ConfigProvider in App.tsx?
// then set all default values to the state of the zone
@@ -29,40 +30,17 @@ const ZoneConfigPanel: React.FC = ({ panelId }) => {
const [, setScale] = useState<[number, number, number]>([1, 1, 1])
return (
-
-
+
+