typing nit

PhotonVision · Dec 30, 2023 · e27f776 · e27f776
1 parent db73bbb
commit e27f776
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/photon-client/src/stores/settings/CameraSettingsStore.ts b/photon-client/src/stores/settings/CameraSettingsStore.ts
@@ -3,7 +3,6 @@ import type {
   CalibrationBoardTypes,
   CameraSettings,
   ConfigurableCameraSettings,
-  Resolution,
   RobotOffsetType,
   VideoFormat
 } from "@/types/SettingTypes";

diff --git a/photon-client/src/types/PhotonTrackingTypes.ts b/photon-client/src/types/PhotonTrackingTypes.ts
@@ -1,3 +1,26 @@
+export interface Quaternion {
+  X: number;
+  Y: number;
+  Z: number;
+  W: number;
+}
+
+export interface Translation3d {
+  x: number
+  y: number
+  z: number
+}
+
+export interface Rotation3d {
+  quaternion: Quaternion
+}
+
+export interface Pose3d {
+  translation: Translation3d,
+  rotation: Rotation3d
+}
+
+// TODO update backend to serialize this using correct layout
 export interface Transform3d {
   x: number;
   y: number;
@@ -11,30 +34,14 @@ export interface Transform3d {
   angle_z: number;
 }
 
-export interface Quaternion {
-  X: number;
-  Y: number;
-  Z: number;
-  W: number;
-}
-
 export interface AprilTagFieldLayout {
   field: {
     length: number;
     width: number;
   };
   tags: {
     ID: number;
-    pose: {
-      translation: {
-        x: number;
-        y: number;
-        z: number;
-      };
-      rotation: {
-        quaternion: Quaternion;
-      };
-    };
+    pose: Pose3d;
   }[];
 }
 

diff --git a/photon-client/src/types/SettingTypes.ts b/photon-client/src/types/SettingTypes.ts
@@ -1,4 +1,5 @@
 import { type ActivePipelineSettings, DefaultAprilTagPipelineSettings } from "@/types/PipelineTypes";
+import type { Pose3d } from "@/types/PhotonTrackingTypes";
 
 export interface GeneralSettings {
   version?: string;
@@ -107,11 +108,6 @@ export interface CvPoint {
   y: number;
 }
 
-export interface Pose3d {
-  translation: { x: number; y: number; z: number };
-  rotation: { quaternion: { W: number; X: number; Y: number; Z: number } };
-}
-
 export interface BoardObservation {
   locationInObjectSpace: CvPoint3[];
   locationInImageSpace: CvPoint[];