updates

Signed-off-by: Jess Frazelle <[email protected]>

Author: jessfraz

modeling-cmds/src/def_enum.rs

@@ -1545,7 +1545,7 @@ define_modeling_cmd_enum! {
         #[derive(Clone, Debug, PartialEq, Deserialize, JsonSchema, Serialize, ModelingCmdVariant)]
         #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
         #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
-        pub struct Solid3dGetInfo {
+        pub struct Solid3dGetAdjancencyInfo {
             /// The Solid3d object whose info is being queried.
             pub object_id: Uuid,
             /// Any edge that lies on the extrusion base path.

modeling-cmds/src/ok_response.rs

@@ -479,10 +479,11 @@ define_ok_modeling_cmd_response_enum! {
         }
 
         /// Extrusion face info struct (useful for maintaining mappings between source path segment ids and extrusion faces)
+        /// This includes the opposite and adjacent faces and edges.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
-        pub struct Solid3dGetInfo {
+        pub struct Solid3dGetAdjancencyInfo {
             /// Details of each edge.
-            pub edges: Vec<EdgeInfo>,
+            pub edges: Vec<AdjacencyInfo>,
         }
 
         /// The response from the `Solid3dGetAllEdgeFaces` command.
@@ -783,6 +784,15 @@ define_ok_modeling_cmd_response_enum! {
             pub edges: Vec<Uuid>,
         }
 
+        /// A list of faces for a specific edge.
+        #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
+        pub struct EdgeInfo {
+            /// The UUID of the id.
+            pub edge_id: Uuid,
+            /// The faces of each edge.
+            pub faces: Vec<Uuid>,
+        }
+
         /// The response from the `EntityClone` command.
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
         pub struct EntityClone {
@@ -899,21 +909,15 @@ define_ok_modeling_cmd_response_enum! {
         /// Edge info struct (useful for maintaining mappings between edges and faces and
         /// adjacent/opposite edges).
         #[derive(Debug, Serialize, Deserialize, Clone, JsonSchema, ModelingCmdOutput)]
-        pub struct EdgeInfo {
+        pub struct AdjacencyInfo {
             /// Edge id.
             pub edge_id: Uuid,
-            /// Opposite edge id.
+            /// Opposite edge and face info.
             #[serde(default, skip_serializing_if = "Option::is_none")]
-            pub opposite_edge_id: Option<Uuid>,
-            /// Adjacent edge id.
+            pub opposite_info: Option<EdgeInfo>,
+            /// Adjacent edge and face info.
             #[serde(default, skip_serializing_if = "Option::is_none")]
-            pub adjacent_edge_id: Option<Uuid>,
-            /// Opposite face ids.
-            #[serde(default, skip_serializing_if = "Vec::is_empty")]
-            pub opposite_face_ids: Vec<Uuid>,
-            /// Adjacent face ids.
-            #[serde(default, skip_serializing_if = "Vec::is_empty")]
-            pub adjacent_face_ids: Vec<Uuid>,
+            pub adjacent_info: Option<EdgeInfo>,
         }
 
         /// The response from the 'SetGridReferencePlane'.