Skip to content
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
36c0fd4
Added basic enter button and arrow keys
Dhruv-0-Arora Aug 15, 2024
ccfc16f
Changes to fix everything before fixing build errors to run on ipad
Dhruv-0-Arora Aug 15, 2024
79f9714
Created working touch control that integrates with preference system
Dhruv-0-Arora Aug 20, 2024
d71fbbd
Merge remote-tracking branch 'origin/dev' into dhruv/1847/touch-controls
Dhruv-0-Arora Aug 20, 2024
f000385
Quick preference system merge conflict fix to allow joysticks to be f…
Dhruv-0-Arora Aug 20, 2024
0b437c9
Working joysticks with assemblies
Dhruv-0-Arora Aug 21, 2024
188e3a7
Merge remote-tracking branch 'origin/dev' into dhruv/1847/touch-controls
Dhruv-0-Arora Aug 21, 2024
9697476
Fixed post-merge conflicts
Dhruv-0-Arora Aug 21, 2024
60b8793
Fixing build errors
Dhruv-0-Arora Aug 21, 2024
11afada
Fixing unit tests
Dhruv-0-Arora Aug 21, 2024
d10592c
Fixing unit tests
Dhruv-0-Arora Aug 22, 2024
609d178
Fixed unit test issues and fixed joysticks
Dhruv-0-Arora Aug 22, 2024
98379a7
Merge remote-tracking branch 'origin/dev' into dhruv/1847/touch-controls
Dhruv-0-Arora Aug 22, 2024
754dba3
Added configuration abilities for touch controls and axis selection
Dhruv-0-Arora Aug 23, 2024
5887044
Fixed build error
Dhruv-0-Arora Aug 23, 2024
e6bb4f9
Added fixes and formatted the place button
Dhruv-0-Arora Aug 23, 2024
1c90d7f
Merge branch 'dev' into dhruv/1847/touch-controls
Dhruv-0-Arora Jun 18, 2025
f317d9c
Merge branch 'dev' into dhruv/1847/touch-controls
Dhruv-0-Arora Jun 18, 2025
9f7d9eb
Fix: Removed the place assembly button
Dhruv-0-Arora Jun 18, 2025
57d6fd6
Merging dev
Dhruv-0-Arora Jun 19, 2025
0192bbf
Fix: made the joysticks scale appropriately with differing screen sizes
Dhruv-0-Arora Jun 20, 2025
1447b1a
Chore: merging dev
Dhruv-0-Arora Jun 20, 2025
96ac3f8
Feat: touch controls enable after spawning asset with touch controls …
Dhruv-0-Arora Jun 20, 2025
39cb3ed
Chore: Formatting
Dhruv-0-Arora Jun 20, 2025
a6b87a9
Merging Dev
Dhruv-0-Arora Jun 20, 2025
973f418
Fix: Formatting error
Dhruv-0-Arora Jun 21, 2025
44b6824
Merge dev
Dhruv-0-Arora Jun 23, 2025
40bfc00
Fix: issue spawning multiple assemblies in a scene
Dhruv-0-Arora Jun 24, 2025
2468a86
Fix: inconsistency in css from merge
Dhruv-0-Arora Jun 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion fission/src/Synthesis.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import GlobalUIComponent from "./ui/components/GlobalUIComponent.tsx"
import InitialConfigPanel from "./ui/panels/configuring/initial-config/InitialConfigPanel.tsx"
import WPILibConnectionStatus from "./ui/components/WPILibConnectionStatus.tsx"
import AutoTestPanel from "./ui/panels/simulation/AutoTestPanel.tsx"
import TouchControls from "./ui/components/TouchControls.tsx"
import GraphicsSettings from "./ui/panels/GraphicsSettingsPanel.tsx"
import MainMenuModal from "@/modals/MainMenuModal"

Expand Down Expand Up @@ -178,11 +179,12 @@ function Synthesis() {
<GlobalUIComponent />
<Scene useStats={import.meta.env.DEV} key="scene-in-toast-provider" />
<SceneOverlay />
<TouchControls />
<ContextMenu />
<MainHUD key={"main-hud"} />
{panelElements.length > 0 && panelElements}
{modalElement && (
<div className="absolute w-full h-full left-0 top-0" key={"modal-element"}>
<div className="fixed w-full h-full left-0 top-0" key={"modal-element"}>
{modalElement}
</div>
)}
Expand Down
9 changes: 9 additions & 0 deletions fission/src/mirabuf/MirabufSceneObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
} from "@/ui/panels/configuring/assembly-config/ConfigurationType"
import { SimConfigData } from "@/ui/panels/simulation/SimConfigShared"
import WPILibBrain from "@/systems/simulation/wpilib_brain/WPILibBrain"
import { Global_AddToast } from "@/ui/components/GlobalUIControls"

const DEBUG_BODIES = false

Expand Down Expand Up @@ -653,6 +654,14 @@ export async function CreateMirabuf(
assembly: mirabuf.Assembly,
progressHandle?: ProgressHandle
): Promise<MirabufSceneObject | null | undefined> {
// Cancel is there is another assembly being placed
console.log(World.SceneRenderer.isPlacingAssembly)
if (World.SceneRenderer.isPlacingAssembly) {
Global_AddToast?.("error", "Error Placing Assembly.", "Place assembly before spawning another.")
return
} else {
World.SceneRenderer.isPlacingAssembly = true
}
const parser = new MirabufParser(assembly, progressHandle)
if (parser.maxErrorSeverity >= ParseErrorSeverity.Unimportable) {
console.error(`Assembly Parser produced significant errors for '${assembly.info!.name!}'`)
Expand Down
Loading
Loading