Skip to content

Commit 00a15f2

Browse files
ryanzhangofficialryanzhangofficial
authored
Merge branch 'dev' into ryan/1924/accelerometer-implementation
2 parents d7b9b3a + 55a3602 commit 00a15f2

File tree

147 files changed

+508
-486
lines changed

Some content is hidden

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

147 files changed

+508
-486
lines changed

‎fission/src/Synthesis.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import { UIRenderer } from "@/ui/UIRenderer.tsx"
88
import PreferencesSystem from "./systems/preferences/PreferencesSystem.ts"
99
import AnalyticsConsent from "./ui/components/AnalyticsConsent.tsx"
1010
import ContextMenu from "./ui/components/ContextMenu.tsx"
11+
import DragModeIndicator from "./ui/components/DragModeIndicator.tsx"
1112
import GlobalUIComponent from "./ui/components/GlobalUIComponent.tsx"
13+
import { globalOpenModal } from "./ui/components/GlobalUIControls.ts"
1214
import ProgressNotifications from "./ui/components/ProgressNotification.tsx"
1315
import SceneOverlay from "./ui/components/SceneOverlay.tsx"
1416
import WPILibConnectionStatus from "./ui/components/WPILibConnectionStatus.tsx"
1517
import MainMenuModal from "./ui/modals/MainMenuModal.tsx"
1618
import { StateProvider } from "./ui/StateProvider.tsx"
1719
import { ThemeProvider } from "./ui/ThemeProvider.tsx"
1820
import { UIProvider } from "./ui/UIProvider.tsx"
19-
import { globalOpenModal } from "./ui/components/GlobalUIControls.ts"
20-
import DragModeIndicator from "./ui/components/DragModeIndicator.tsx"
2121

2222
function Synthesis() {
2323
const [consentPopupDisable, setConsentPopupDisable] = useState<boolean>(true)

‎fission/src/aps/APSDataManagement.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Mutex } from "async-mutex"
22
import { globalAddToast } from "@/ui/components/GlobalUIControls"
3-
import TaskStatus from "@/util/TaskStatus"
3+
import type TaskStatus from "@/util/TaskStatus"
44
import APS from "./APS"
55

66
export const FOLDER_DATA_TYPE = "folders"

‎fission/src/mirabuf/EjectableSceneObject.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Jolt from "@azaleacolburn/jolt-physics"
1+
import type Jolt from "@azaleacolburn/jolt-physics"
22
import * as THREE from "three"
33
import SceneObject from "@/systems/scene/SceneObject"
44
import World from "@/systems/World"
@@ -10,7 +10,7 @@ import {
1010
convertThreeVector3ToJoltRVec3,
1111
convertThreeVector3ToJoltVec3,
1212
} from "@/util/TypeConversions"
13-
import MirabufSceneObject from "./MirabufSceneObject"
13+
import type MirabufSceneObject from "./MirabufSceneObject"
1414
import ScoringZoneSceneObject from "./ScoringZoneSceneObject"
1515

1616
class EjectableSceneObject extends SceneObject {

‎fission/src/mirabuf/FieldMiraEditor.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
1+
import type { ScoringZonePreferences } from "@/systems/preferences/PreferenceTypes"
22
import { mirabuf } from "../proto/mirabuf"
33

44
interface DevtoolMiraData {

‎fission/src/mirabuf/IntakeSensorSceneObject.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Jolt from "@azaleacolburn/jolt-physics"
1+
import type Jolt from "@azaleacolburn/jolt-physics"
22
import * as THREE from "three"
33
import { OnContactPersistedEvent } from "@/systems/physics/ContactEvents"
44
import SceneObject from "@/systems/scene/SceneObject"
@@ -10,7 +10,8 @@ import {
1010
convertThreeQuaternionToJoltQuat,
1111
convertThreeVector3ToJoltRVec3,
1212
} from "@/util/TypeConversions"
13-
import MirabufSceneObject, { RigidNodeAssociate } from "./MirabufSceneObject"
13+
import type MirabufSceneObject from "./MirabufSceneObject"
14+
import type { RigidNodeAssociate } from "./MirabufSceneObject"
1415

1516
class IntakeSensorSceneObject extends SceneObject {
1617
private _parentAssembly: MirabufSceneObject

‎fission/src/mirabuf/MirabufInstance.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as THREE from "three"
22
import World from "@/systems/World.ts"
3-
import { ProgressHandle } from "@/ui/components/ProgressNotificationData.ts"
4-
import { mirabuf } from "../proto/mirabuf"
5-
import MirabufParser, { ParseErrorSeverity } from "./MirabufParser.ts"
3+
import type { ProgressHandle } from "@/ui/components/ProgressNotificationData.ts"
4+
import type { mirabuf } from "../proto/mirabuf"
5+
import type MirabufParser from "./MirabufParser.ts"
6+
import { ParseErrorSeverity } from "./MirabufParser.ts"
67

78
type MirabufPartInstanceGUID = string
89

‎fission/src/mirabuf/MirabufLoader.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Pako from "pako"
2-
import { Data, downloadData } from "@/aps/APSDataManagement"
2+
import { type Data, downloadData } from "@/aps/APSDataManagement"
33
import { globalAddToast } from "@/components/GlobalUIControls"
44
import { mirabuf } from "@/proto/mirabuf"
55
import World from "@/systems/World"

‎fission/src/mirabuf/MirabufParser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as THREE from "three"
22
import { mirabuf } from "@/proto/mirabuf"
3-
import { ProgressHandle } from "@/ui/components/ProgressNotificationData"
3+
import type { ProgressHandle } from "@/ui/components/ProgressNotificationData"
44
import { convertMirabufTransformToThreeMatrix } from "@/util/TypeConversions"
55

66
export type RigidNodeId = string

‎fission/src/mirabuf/MirabufSceneObject.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import Jolt from "@azaleacolburn/jolt-physics"
1+
import type Jolt from "@azaleacolburn/jolt-physics"
22
import * as THREE from "three"
3-
import { mirabuf } from "@/proto/mirabuf"
3+
import type { mirabuf } from "@/proto/mirabuf"
44
import { OnContactAddedEvent } from "@/systems/physics/ContactEvents"
5-
import Mechanism from "@/systems/physics/Mechanism"
6-
import { BodyAssociate, LayerReserve } from "@/systems/physics/PhysicsSystem"
5+
import type Mechanism from "@/systems/physics/Mechanism"
6+
import { BodyAssociate, type LayerReserve } from "@/systems/physics/PhysicsSystem"
77
import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
8-
import {
8+
import type {
99
Alliance,
1010
EjectorPreferences,
1111
FieldPreferences,
@@ -14,16 +14,20 @@ import {
1414
ScoringZonePreferences,
1515
Station,
1616
} from "@/systems/preferences/PreferenceTypes"
17-
import { CustomOrbitControls } from "@/systems/scene/CameraControls"
18-
import GizmoSceneObject from "@/systems/scene/GizmoSceneObject"
19-
import Brain from "@/systems/simulation/Brain"
17+
import type { CustomOrbitControls } from "@/systems/scene/CameraControls"
18+
import type GizmoSceneObject from "@/systems/scene/GizmoSceneObject"
19+
import type Brain from "@/systems/simulation/Brain"
20+
import type { SimConfigData } from "@/systems/simulation/SimConfigShared"
2021
import SynthesisBrain from "@/systems/simulation/synthesis_brain/SynthesisBrain"
2122
import WPILibBrain from "@/systems/simulation/wpilib_brain/WPILibBrain"
2223
import World from "@/systems/World"
23-
import { ContextData, ContextSupplier } from "@/ui/components/ContextMenuData"
24+
import type { ContextData, ContextSupplier } from "@/ui/components/ContextMenuData"
2425
import { globalAddToast } from "@/ui/components/GlobalUIControls"
25-
import { ProgressHandle } from "@/ui/components/ProgressNotificationData"
26+
import type { ProgressHandle } from "@/ui/components/ProgressNotificationData"
2627
import { SceneOverlayTag } from "@/ui/components/SceneOverlayEvents"
28+
import { ConfigMode } from "@/ui/panels/configuring/assembly-config/ConfigTypes"
29+
import ConfigurePanel from "@/ui/panels/configuring/assembly-config/ConfigurePanel"
30+
import AutoTestPanel from "@/ui/panels/simulation/AutoTestPanel"
2731
import JOLT from "@/util/loading/JoltSyncLoader"
2832
import { convertJoltMat44ToThreeMatrix4, convertJoltVec3ToThreeVector3 } from "@/util/TypeConversions"
2933
import SceneObject from "../systems/scene/SceneObject"
@@ -35,10 +39,6 @@ import { MiraType } from "./MirabufLoader"
3539
import MirabufParser, { ParseErrorSeverity, type RigidNodeId, type RigidNodeReadOnly } from "./MirabufParser"
3640
import ProtectedZoneSceneObject from "./ProtectedZoneSceneObject"
3741
import ScoringZoneSceneObject from "./ScoringZoneSceneObject"
38-
import { SimConfigData } from "@/systems/simulation/SimConfigShared"
39-
import ConfigurePanel from "@/ui/panels/configuring/assembly-config/ConfigurePanel"
40-
import AutoTestPanel from "@/ui/panels/simulation/AutoTestPanel"
41-
import { ConfigMode } from "@/ui/panels/configuring/assembly-config/ConfigTypes"
4242

4343
const DEBUG_BODIES = false
4444

‎fission/src/mirabuf/ProtectedZoneSceneObject.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import Jolt from "@azaleacolburn/jolt-physics"
22
import * as THREE from "three"
3+
import MatchMode from "@/systems/match_mode/MatchMode"
4+
import { MatchModeType } from "@/systems/match_mode/MatchModeTypes"
35
import { OnContactAddedEvent, OnContactPersistedEvent, OnContactRemovedEvent } from "@/systems/physics/ContactEvents"
46
import PreferencesSystem from "@/systems/preferences/PreferencesSystem"
5-
import { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"
7+
import type { ProtectedZonePreferences } from "@/systems/preferences/PreferenceTypes"
68
import SceneObject from "@/systems/scene/SceneObject"
79
import SimulationSystem from "@/systems/simulation/SimulationSystem"
810
import World from "@/systems/World"
@@ -15,10 +17,8 @@ import {
1517
} from "@/util/TypeConversions"
1618
import { deltaFieldTransformsPhysicalProp } from "@/util/threejs/MeshCreation"
1719
import { MiraType } from "./MirabufLoader"
18-
import MatchMode from "@/systems/match_mode/MatchMode"
19-
20-
import MirabufSceneObject, { RigidNodeAssociate } from "./MirabufSceneObject"
21-
import { MatchModeType } from "@/systems/match_mode/MatchModeTypes"
20+
import type MirabufSceneObject from "./MirabufSceneObject"
21+
import type { RigidNodeAssociate } from "./MirabufSceneObject"
2222
import { ContactType } from "./ZoneTypes"
2323

2424
class ProtectedZoneSceneObject extends SceneObject {

0 commit comments

Comments
 (0)