Add a top_loc bridge

Author: bschwind

crates/opencascade-sys/src/lib.rs

@@ -5,6 +5,7 @@ pub mod gc_pnts;
 pub mod poly;
 pub mod shape_analysis;
 pub mod shape_upgrade;
+pub mod top_loc;
 
 #[cxx::bridge]
 pub mod ffi {
@@ -431,16 +432,12 @@ pub mod ffi {
         pub fn TopoDS_cast_to_compound(shape: &TopoDS_Shape) -> &TopoDS_Compound;
 
         #[cxx_name = "Move"]
-        pub fn translate(
-            self: Pin<&mut TopoDS_Shape>,
-            position: &TopLoc_Location,
-            raise_exception: bool,
-        );
+        pub fn translate(self: Pin<&mut TopoDS_Shape>, position: &Location, raise_exception: bool);
 
         #[cxx_name = "Location"]
         pub fn set_global_translation(
             self: Pin<&mut TopoDS_Shape>,
-            translation: &TopLoc_Location,
+            translation: &Location,
             raise_exception: bool,
         );
 
@@ -1133,7 +1130,7 @@ pub mod ffi {
         pub fn BRep_Tool_Pnt(vertex: &TopoDS_Vertex) -> UniquePtr<gp_Pnt>;
         pub fn BRep_Tool_Triangulation(
             face: &TopoDS_Face,
-            location: Pin<&mut TopLoc_Location>,
+            location: Pin<&mut Location>,
         ) -> UniquePtr<HandlePoly_Triangulation>;
 
         type BRepIntCurveSurface_Inter;
@@ -1246,14 +1243,8 @@ pub mod ffi {
         pub fn Shape(self: &BRepMesh_IncrementalMesh) -> &TopoDS_Shape;
         pub fn IsDone(self: &BRepMesh_IncrementalMesh) -> bool;
 
-        type TopLoc_Location;
-        #[cxx_name = "construct_unique"]
-        pub fn TopLoc_Location_ctor() -> UniquePtr<TopLoc_Location>;
-
-        #[cxx_name = "construct_unique"]
-        pub fn TopLoc_Location_from_transform(transform: &gp_Trsf) -> UniquePtr<TopLoc_Location>;
-
-        pub fn TopLoc_Location_Transformation(location: &TopLoc_Location) -> UniquePtr<gp_Trsf>;
+        #[cxx_name = "TopLoc_Location"]
+        type Location = crate::top_loc::Location;
 
         #[cxx_name = "Poly_Triangulation"]
         type Poly_Triangulation = crate::poly::Triangulation;

crates/opencascade-sys/src/top_loc.rs

@@ -0,0 +1,35 @@
+use cxx::UniquePtr;
+pub use inner::*;
+
+#[cxx::bridge]
+mod inner {
+    unsafe extern "C++" {
+        include!("opencascade-sys/include/wrapper.hxx");
+
+        type gp_Trsf = crate::ffi::gp_Trsf;
+
+        #[cxx_name = "TopLoc_Location"]
+        type Location;
+        #[cxx_name = "construct_unique"]
+        pub fn Location_new() -> UniquePtr<Location>;
+
+        #[cxx_name = "construct_unique"]
+        fn Location_from_transform(transform: &gp_Trsf) -> UniquePtr<Location>;
+
+        fn TopLoc_Location_Transformation(location: &Location) -> UniquePtr<gp_Trsf>;
+    }
+}
+
+impl Location {
+    pub fn new() -> UniquePtr<Self> {
+        Location_new()
+    }
+
+    pub fn from_transform(transform: &gp_Trsf) -> UniquePtr<Location> {
+        Location_from_transform(transform)
+    }
+
+    pub fn transform(&self) -> UniquePtr<gp_Trsf> {
+        TopLoc_Location_Transformation(self)
+    }
+}

crates/opencascade-sys/tests/triangulation.rs

@@ -1,7 +1,10 @@
-use opencascade_sys::ffi::{
-    new_point, BRepMesh_IncrementalMesh_ctor, BRepPrimAPI_MakeBox_ctor, BRep_Tool_Triangulation,
-    HandlePoly_Triangulation_Get, TopAbs_ShapeEnum, TopExp_Explorer_ctor, TopLoc_Location_ctor,
-    TopoDS_cast_to_face,
+use opencascade_sys::{
+    ffi::{
+        new_point, BRepMesh_IncrementalMesh_ctor, BRepPrimAPI_MakeBox_ctor,
+        BRep_Tool_Triangulation, HandlePoly_Triangulation_Get, TopAbs_ShapeEnum,
+        TopExp_Explorer_ctor, TopoDS_cast_to_face,
+    },
+    top_loc::Location,
 };
 
 #[test]
@@ -17,7 +20,7 @@ fn it_can_access_mesh_triangulation() {
         TopExp_Explorer_ctor(mesh.pin_mut().Shape(), TopAbs_ShapeEnum::TopAbs_FACE);
     while edge_explorer.More() {
         let face = TopoDS_cast_to_face(edge_explorer.Current());
-        let mut location = TopLoc_Location_ctor();
+        let mut location = Location::new();
 
         let triangulation_handle = BRep_Tool_Triangulation(face, location.pin_mut());
         if let Ok(triangulation) = HandlePoly_Triangulation_Get(&triangulation_handle) {

crates/opencascade/src/mesh.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use cxx::UniquePtr;
 use glam::{dvec2, dvec3, DVec2, DVec3};
-use opencascade_sys::ffi;
+use opencascade_sys::{ffi, top_loc::Location};
 
 #[derive(Debug)]
 pub struct Mesh {
@@ -38,7 +38,7 @@ impl Mesher {
         let triangulated_shape = Shape::from_shape(self.inner.pin_mut().Shape());
 
         for face in triangulated_shape.faces() {
-            let mut location = ffi::TopLoc_Location_ctor();
+            let mut location = Location::new();
 
             let triangulation_handle =
                 ffi::BRep_Tool_Triangulation(&face.inner, location.pin_mut());
@@ -51,7 +51,7 @@ impl Mesher {
 
             for i in 1..=face_point_count {
                 let mut point = triangulation.node(i);
-                point.pin_mut().Transform(&ffi::TopLoc_Location_Transformation(&location));
+                point.pin_mut().Transform(&location.transform());
                 vertices.push(dvec3(point.X(), point.Y(), point.Z()));
             }
 

crates/opencascade/src/primitives/shape.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 use cxx::UniquePtr;
 use glam::{dvec2, dvec3, DVec3};
-use opencascade_sys::{ffi, shape_upgrade::UnifySameDomain};
+use opencascade_sys::{ffi, shape_upgrade::UnifySameDomain, top_loc::Location};
 use std::path::Path;
 
 pub struct Shape {
@@ -626,7 +626,7 @@ impl Shape {
         let translation_vec = make_vec(translation);
         transform.pin_mut().set_translation_vec(&translation_vec);
 
-        let location = ffi::TopLoc_Location_from_transform(&transform);
+        let location = Location::from_transform(&transform);
 
         self.inner.pin_mut().set_global_translation(&location, false);
     }

crates/opencascade/src/primitives/wire.rs

@@ -1,4 +1,4 @@
-use opencascade_sys::{b_rep_tools, shape_analysis::connect_edges_to_wires};
+use opencascade_sys::{b_rep_tools, shape_analysis::connect_edges_to_wires, top_loc::Location};
 use std::iter::once;
 
 use crate::{
@@ -235,7 +235,7 @@ impl Wire {
 
         transform.pin_mut().SetRotation(&rotation_axis_vec, angle.radians());
         transform.pin_mut().set_translation_vec(&translation_vec);
-        let location = ffi::TopLoc_Location_from_transform(&transform);
+        let location = Location::from_transform(&transform);
 
         let wire_shape = ffi::cast_wire_to_shape(&self.inner);
         let mut wire_shape = Shape::from_shape(wire_shape).inner;