Save/restore camera views

modeling-cmds/src/def_enum.rs

@@ -15,6 +15,7 @@
         use schemars::JsonSchema;
         use serde::{Deserialize, Serialize};
         use uuid::Uuid;
+        use crate::shared::CameraViewState;
 
         use crate::{
             format::{OutputFormat2d, OutputFormat3d},
@@ -273,6 +274,21 @@
         #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
         pub struct DefaultCameraGetSettings {}
 
+        /// Gets the default camera's view state
+        #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
+        #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+        #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+        pub struct DefaultCameraGetView {}
+
+        /// Sets the default camera's view state
+        #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
+        #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+        #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+        pub struct DefaultCameraSetView {
+            /// Camera view state
+            pub view: CameraViewState,
+        }
+
         /// Change what the default camera is looking at.
         #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema, ModelingCmdVariant)]
         #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]

modeling-cmds/src/ok_response.rs

@@ -12,6 +12,7 @@ define_ok_modeling_cmd_response_enum! {
         use serde::{Deserialize, Serialize};
         use uuid::Uuid;
         use crate::shared::CameraSettings;
+        use crate::shared::CameraViewState;
 
         use crate::{self as kittycad_modeling_cmds};
         use crate::{
@@ -397,6 +398,17 @@ define_ok_modeling_cmd_response_enum! {
             pub settings: CameraSettings
         }
 
+        /// The response from the `DefaultCameraGetView` command.
+        #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
+        pub struct DefaultCameraGetView {
+            /// Camera view state
+            pub view: CameraViewState
+        }
+
+        /// The response from the `DefaultCameraSetView` command.
+        #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
+        pub struct DefaultCameraSetView {}
+
         /// The response from the `DefaultCameraZoom` command.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         pub struct DefaultCameraZoom {

modeling-cmds/src/shared.rs

@@ -739,6 +739,55 @@
     pub ortho: bool,
 }
 
+#[allow(missing_docs)]
+#[repr(u8)]
+#[derive(Default, Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+pub enum WorldCoordinateSystem {
+    #[default]
+    RightHandedUpZ,
+    RightHandedUpY,
+}
+
+#[allow(missing_docs)]
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, JsonSchema)]
+#[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
+#[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
+pub struct CameraViewState {
+    pub pivot_rotation: [f32; 4],
+    pub pivot_position: [f32; 3],
+    pub eye_offset: f32,
+    pub fov_y: f32,
+    pub ortho_scale_factor: f32,
+    pub is_ortho: bool,
+    pub ortho_scale_enabled: bool,
+    pub world_coord_system: WorldCoordinateSystem,
+}
+
+impl Default for CameraViewState {
+    fn default() -> Self {
+        CameraViewState {
+            pivot_rotation: [0.0, 0.0, 0.0, 1.0],
+            pivot_position: [0.0, 0.0, 0.0],
+            eye_offset: 10.0,
+            fov_y: 45.0,
+            ortho_scale_factor: 1.6,
+            is_ortho: false,
+            ortho_scale_enabled: true,
+            world_coord_system: WorldCoordinateSystem::default(),
+        }
+    }
+}
+
+#[cfg(feature = "cxx")]
+impl_extern_type! {
+    [Trivial]
+    CameraViewState = "Endpoints::CameraViewState"
+}
+
 impl From<CameraSettings> for crate::output::DefaultCameraZoom {
     fn from(settings: CameraSettings) -> Self {
         Self { settings }