From 73c2745365197af282279450b2b9213d028ba77b Mon Sep 17 00:00:00 2001
From: Dominick Schroer <dominick@schroer.ca>
Date: Mon, 4 Dec 2023 20:07:43 -0700
Subject: [PATCH 1/2] add make solid and shell constructors

---
 crates/opencascade-sys/include/wrapper.hxx |  3 +++
 crates/opencascade-sys/src/lib.rs          | 24 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/crates/opencascade-sys/include/wrapper.hxx b/crates/opencascade-sys/include/wrapper.hxx
index 6f91248c..16c43934 100644
--- a/crates/opencascade-sys/include/wrapper.hxx
+++ b/crates/opencascade-sys/include/wrapper.hxx
@@ -8,6 +8,7 @@
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <BRepBuilderAPI_MakeShapeOnMesh.hxx>
+#include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
@@ -256,6 +257,8 @@ inline std::unique_ptr<TopoDS_Shape> TopoDS_Compound_as_shape(std::unique_ptr<To
   return compound;
 }
 
+inline std::unique_ptr<TopoDS_Shape> TopoDS_Shell_as_shape(std::unique_ptr<TopoDS_Shell> shell) { return shell; }
+
 inline const TopoDS_Builder &BRep_Builder_upcast_to_topods_builder(const BRep_Builder &builder) { return builder; }
 
 // Transforms
diff --git a/crates/opencascade-sys/src/lib.rs b/crates/opencascade-sys/src/lib.rs
index 8f713a2c..3642c720 100644
--- a/crates/opencascade-sys/src/lib.rs
+++ b/crates/opencascade-sys/src/lib.rs
@@ -426,17 +426,23 @@ pub mod ffi {
             compound: UniquePtr<TopoDS_Compound>,
         ) -> UniquePtr<TopoDS_Shape>;
 
+        pub fn TopoDS_Shell_as_shape(shell: UniquePtr<TopoDS_Shell>) -> UniquePtr<TopoDS_Shape>;
+
         type BRep_Builder;
         type TopoDS_Builder;
 
         #[cxx_name = "construct_unique"]
         pub fn TopoDS_Compound_ctor() -> UniquePtr<TopoDS_Compound>;
 
+        #[cxx_name = "construct_unique"]
+        pub fn TopoDS_Shell_ctor() -> UniquePtr<TopoDS_Shell>;
+
         #[cxx_name = "construct_unique"]
         pub fn BRep_Builder_ctor() -> UniquePtr<BRep_Builder>;
 
         pub fn BRep_Builder_upcast_to_topods_builder(builder: &BRep_Builder) -> &TopoDS_Builder;
         pub fn MakeCompound(self: &TopoDS_Builder, compound: Pin<&mut TopoDS_Compound>);
+        pub fn MakeShell(self: &TopoDS_Builder, compound: Pin<&mut TopoDS_Shell>);
         pub fn Add(self: &TopoDS_Builder, shape: Pin<&mut TopoDS_Shape>, compound: &TopoDS_Shape);
 
         // BRepBuilder
@@ -907,6 +913,17 @@ pub mod ffi {
         #[cxx_name = "SetTranslationPart"]
         pub fn set_translation_vec(self: Pin<&mut gp_Trsf>, translation: &gp_Vec);
 
+        type BRepBuilderAPI_MakeSolid;
+
+        #[cxx_name = "construct_unique"]
+        pub fn BRepBuilderAPI_MakeSolid_ctor(
+            shell: &TopoDS_Shell,
+        ) -> UniquePtr<BRepBuilderAPI_MakeSolid>;
+
+        pub fn Shape(self: Pin<&mut BRepBuilderAPI_MakeSolid>) -> &TopoDS_Shape;
+        pub fn Build(self: Pin<&mut BRepBuilderAPI_MakeSolid>, progress: &Message_ProgressRange);
+        pub fn IsDone(self: &BRepBuilderAPI_MakeSolid) -> bool;
+
         type BRepBuilderAPI_MakeShapeOnMesh;
 
         #[cxx_name = "construct_unique"]
@@ -1079,9 +1096,12 @@ pub mod ffi {
         pub fn TopLoc_Location_Transformation(location: &TopLoc_Location) -> UniquePtr<gp_Trsf>;
 
         type Handle_Poly_Triangulation;
+
+        /// # Safety
+        /// This method is safe assuming that `triangulation` points to a valid constructed object or is a null pointer.
         #[cxx_name = "construct_unique"]
-        pub fn Handle_Poly_Triangulation_ctor(
-            triangulation: &Handle_Poly_Triangulation,
+        pub unsafe fn Handle_Poly_Triangulation_ctor(
+            triangulation: *const Poly_Triangulation,
         ) -> UniquePtr<Handle_Poly_Triangulation>;
 
         pub fn IsNull(self: &Handle_Poly_Triangulation) -> bool;

From 54abafeeeb5d4045a48802f3f796081fe5c5fde9 Mon Sep 17 00:00:00 2001
From: Dominick Schroer <dominick@schroer.ca>
Date: Sat, 6 Jan 2024 11:57:19 -0700
Subject: [PATCH 2/2] remove unsafe code

---
 crates/opencascade-sys/include/wrapper.hxx | 5 +++++
 crates/opencascade-sys/src/lib.rs          | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/opencascade-sys/include/wrapper.hxx b/crates/opencascade-sys/include/wrapper.hxx
index 16c43934..80be2304 100644
--- a/crates/opencascade-sys/include/wrapper.hxx
+++ b/crates/opencascade-sys/include/wrapper.hxx
@@ -279,6 +279,11 @@ inline std::unique_ptr<gp_Trsf> TopLoc_Location_Transformation(const TopLoc_Loca
   return std::unique_ptr<gp_Trsf>(new gp_Trsf(location.Transformation()));
 }
 
+inline std::unique_ptr<Handle_Poly_Triangulation>
+Handle_Poly_Triangulation_ctor(const Poly_Triangulation &triangulation) {
+  return std::unique_ptr<Handle_Poly_Triangulation>(new Handle_Poly_Triangulation(&triangulation));
+}
+
 inline std::unique_ptr<Handle_Poly_Triangulation> BRep_Tool_Triangulation(const TopoDS_Face &face,
                                                                           TopLoc_Location &location) {
   return std::unique_ptr<Handle_Poly_Triangulation>(
diff --git a/crates/opencascade-sys/src/lib.rs b/crates/opencascade-sys/src/lib.rs
index 3642c720..efdc27a9 100644
--- a/crates/opencascade-sys/src/lib.rs
+++ b/crates/opencascade-sys/src/lib.rs
@@ -1097,11 +1097,8 @@ pub mod ffi {
 
         type Handle_Poly_Triangulation;
 
-        /// # Safety
-        /// This method is safe assuming that `triangulation` points to a valid constructed object or is a null pointer.
-        #[cxx_name = "construct_unique"]
-        pub unsafe fn Handle_Poly_Triangulation_ctor(
-            triangulation: *const Poly_Triangulation,
+        pub fn Handle_Poly_Triangulation_ctor(
+            triangulation: &Poly_Triangulation,
         ) -> UniquePtr<Handle_Poly_Triangulation>;
 
         pub fn IsNull(self: &Handle_Poly_Triangulation) -> bool;