cleanup bindings

mcneel · Aug 6, 2024 · e80d143 · e80d143
1 parent 96c5d61
commit e80d143
Show file tree

Hide file tree

Showing 139 changed files with 287 additions and 1,038 deletions.
diff --git a/src/bindings/bindings.cpp b/src/bindings/bindings.cpp
@@ -91,7 +91,7 @@ EMSCRIPTEN_BINDINGS(rhino3dm) {
 #if defined(ON_PYTHON_COMPILE)
 std::string ToStdString(const py::str& str)
 {
- std::string rc = str;
+ std::string rc = py::cast<std::string>(str);
  return rc;
 }
 #endif

diff --git a/src/bindings/bindings.h b/src/bindings/bindings.h
@@ -16,14 +16,17 @@
 #define RH3DM_PYTHON_BINDING(name, variable) NB_MODULE(name, variable)
 #define def_property def_prop_rw
 #define def_property_readonly def_prop_ro
+#define def_readonly def_ro
+#define def_readwrite def_rw
+#define def_property_readonly_static def_prop_ro_static
 #define UNIMPLEMENTED_EXCEPTION throw std::exception()
 
 #else
  #include <pybind11/pybind11.h>
  #include <pybind11/stl.h>
  namespace py = pybind11;
  #define RH3DM_PYTHON_BINDING(name, variable) PYBIND11_MODULE(name, variable)
- typedef pybind11::module_ rh3dmpymodule;
+ typedef pybind11::module rh3dmpymodule;
 #endif
 
 std::string ToStdString(const py::str& str);
@@ -44,6 +47,7 @@ typedef py::tuple BND_Color;
 typedef py::tuple BND_Color4f;
 typedef py::tuple BND_TUPLE;
 typedef py::handle BND_DateTime;
+typedef py::list BND_LIST;
 #endif
 
 #if defined(ON_WASM_COMPILE)

diff --git a/src/bindings/bnd_3dm_attributes.cpp b/src/bindings/bnd_3dm_attributes.cpp
@@ -109,12 +109,8 @@ BND_TUPLE BND_3dmObjectAttributes::GetGroupList() const
 //////////////////////////////////////////////////////////////////////////////////////
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void init3dmAttributesBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void init3dmAttributesBindings(py::module& m)
+
+void init3dmAttributesBindings(rh3dmpymodule& m)
 
 {
  py::class_<BND_3dmObjectAttributes, BND_CommonObject>(m, "ObjectAttributes")
@@ -155,7 +151,7 @@ void init3dmAttributesBindings(py::module& m)
  .def("RemoveFromAllGroups", &BND_3dmObjectAttributes::RemoveFromAllGroups)
  ;
 }
-#endif
+
 #endif
 
 #if defined(ON_WASM_COMPILE)

diff --git a/src/bindings/bnd_3dm_attributes.h b/src/bindings/bnd_3dm_attributes.h
@@ -3,16 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-
-#if defined(NANOBIND)
-namespace py = nanobind;
-void init3dmAttributesBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void init3dmAttributesBindings(py::module& m);
-#endif
-
-
+void init3dmAttributesBindings(rh3dmpymodule& m);
 #else
 void init3dmAttributesBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_3dm_settings.cpp b/src/bindings/bnd_3dm_settings.cpp
@@ -122,13 +122,8 @@ void BND_File3dmSettings::SetEarthAnchorPoint(const BND_EarthAnchorPoint& anchor
 }
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void init3dmSettingsBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void init3dmSettingsBindings(py::module& m)
 
+void init3dmSettingsBindings(rh3dmpymodule& m)
 {
  py::class_<BND_ConstructionPlane>(m, "ConstructionPlane")
  .def(py::init<>())
@@ -220,7 +215,7 @@ void init3dmSettingsBindings(py::module& m)
  .def_property_readonly("RenderSettings", &BND_File3dmSettings::GetRenderSettings)
  ;
 }
-#endif
+
 #endif
 
 #if defined(ON_WASM_COMPILE)

diff --git a/src/bindings/bnd_3dm_settings.h b/src/bindings/bnd_3dm_settings.h
@@ -4,14 +4,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void init3dmSettingsBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void init3dmSettingsBindings(py::module& m);
-#endif
-
+void init3dmSettingsBindings(rh3dmpymodule& m);
 #else
 void init3dmSettingsBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_annotationbase.cpp b/src/bindings/bnd_annotationbase.cpp
@@ -630,10 +630,7 @@ std::vector<ON_Line> BND_Centermark::GetDisplayLines(const BND_DimensionStyle& d
 
 #if defined(ON_PYTHON_COMPILE)
 
-#if defined(NANOBIND)
-void initAnnotationBaseBindings(py::module_& m){}
-#else
-void initAnnotationBaseBindings(py::module& m)
+void initAnnotationBaseBindings(rh3dmpymodule& m)
 {
  py::class_<BND_AnnotationBase, BND_GeometryBase>(m, "AnnotationBase")
  .def_property_readonly("DimensionStyleId", &BND_AnnotationBase::DimensionStyleId)
@@ -691,7 +688,6 @@ void initAnnotationBaseBindings(py::module& m)
 
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_annotationbase.h b/src/bindings/bnd_annotationbase.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initAnnotationBaseBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initAnnotationBaseBindings(py::module& m);
-#endif
-
+void initAnnotationBaseBindings(rh3dmpymodule& m);
 #else
 void initAnnotationBaseBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_arc.cpp b/src/bindings/bnd_arc.cpp
@@ -125,13 +125,7 @@ BND_NurbsCurve* BND_Arc::ToNurbsCurve() const
 
 #if defined(ON_PYTHON_COMPILE)
 
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initArcBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void initArcBindings(py::module& m)
-
+void initArcBindings(rh3dmpymodule& m)
 {
  py::class_<BND_Arc>(m, "Arc")
  .def(py::init<const BND_Circle&, double>(), py::arg("circle"), py::arg("angleRadians"))
@@ -167,7 +161,6 @@ void initArcBindings(py::module& m)
  .def("ToNurbsCurve", &BND_Arc::ToNurbsCurve);
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_arc.h b/src/bindings/bnd_arc.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initArcBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initArcBindings(py::module& m);
-#endif
-
+void initArcBindings(rh3dmpymodule& m);
 #else
 void initArcBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_arccurve.cpp b/src/bindings/bnd_arccurve.cpp
@@ -51,12 +51,7 @@ void BND_ArcCurve::SetTrackedPointer(ON_ArcCurve* arccurve, const ON_ModelCompon
 
 #if defined(ON_PYTHON_COMPILE)
 
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initArcCurveBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void initArcCurveBindings(py::module& m)
+void initArcCurveBindings(rh3dmpymodule& m)
 {
  py::class_<BND_ArcCurve, BND_Curve>(m, "ArcCurve")
  .def_static("CreateFromArc", &BND_ArcCurve::CreateFromArc, py::arg("arc"))
@@ -73,7 +68,6 @@ void initArcCurveBindings(py::module& m)
  ;
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_arccurve.h b/src/bindings/bnd_arccurve.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initArcCurveBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initArcCurveBindings(py::module& m);
-#endif
-
+void initArcCurveBindings(rh3dmpymodule& m);
 #else
 void initArcCurveBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_beam.cpp b/src/bindings/bnd_beam.cpp
@@ -192,13 +192,8 @@ BND_Extrusion::BND_Extrusion(ON_Extrusion* extrusion, const ON_ModelComponentRef
 //////////////////////////////////////////////////////////////////////////////
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initExtrusionBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void initExtrusionBindings(py::module& m)
 
+void initExtrusionBindings(rh3dmpymodule& m)
 {
  py::class_<BND_Extrusion, BND_Surface>(m, "Extrusion")
  .def_static("Create", &BND_Extrusion::Create, py::arg("planarCurve"), py::arg("height"), py::arg("cap"))
@@ -236,7 +231,6 @@ void initExtrusionBindings(py::module& m)
  ;
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_beam.h b/src/bindings/bnd_beam.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initExtrusionBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initExtrusionBindings(py::module& m);
-#endif
-
+void initExtrusionBindings(rh3dmpymodule& m);
 #else
 void initExtrusionBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_bezier.cpp b/src/bindings/bnd_bezier.cpp
@@ -32,12 +32,8 @@ BND_TUPLE BND_BezierCurve::Split(double t)
 
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initBezierBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void initBezierBindings(py::module& m)
+
+void initBezierBindings(rh3dmpymodule& m)
 {
  py::class_<BND_BezierCurve>(m, "BezierCurve")
  .def_property_readonly("Dimension", &BND_BezierCurve::Dimension)
@@ -56,7 +52,6 @@ void initBezierBindings(py::module& m)
  ;
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_bezier.h b/src/bindings/bnd_bezier.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initBezierBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initBezierBindings(py::module& m);
-#endif
-
+void initBezierBindings(rh3dmpymodule& m);
 #else
 void initBezierBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_bitmap.cpp b/src/bindings/bnd_bitmap.cpp
@@ -17,12 +17,8 @@ void BND_Bitmap::SetTrackedPointer(ON_Bitmap* bitmap, const ON_ModelComponentRef
 
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initBitmapBindings(py::module_& m){}
-#else
-namespace py = pybind11;
-void initBitmapBindings(py::module& m)
+
+void initBitmapBindings(rh3dmpymodule& m)
 {
  py::class_<BND_Bitmap>(m, "Bitmap")
  .def(py::init<>())
@@ -34,7 +30,6 @@ void initBitmapBindings(py::module& m)
  ;
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_bitmap.h b/src/bindings/bnd_bitmap.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initBitmapBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initBitmapBindings(py::module& m);
-#endif
-
+void initBitmapBindings(rh3dmpymodule& m);
 #else
 void initBitmapBindings(void* m);
 #endif

diff --git a/src/bindings/bnd_boundingbox.cpp b/src/bindings/bnd_boundingbox.cpp
@@ -161,10 +161,8 @@ BND_BoundingBox* BND_BoundingBox::Decode(emscripten::val jsonObject)
 
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-void initBoundingBoxBindings(py::module_& m){}
-#else
-void initBoundingBoxBindings(py::module& m)
+
+void initBoundingBoxBindings(rh3dmpymodule& m)
 {
  py::class_<BND_BoundingBox>(m, "BoundingBox")
  .def(py::init<ON_3dPoint, ON_3dPoint>(), py::arg("minPoint"), py::arg("maxPoint"))
@@ -189,7 +187,6 @@ void initBoundingBoxBindings(py::module& m)
  ;
 }
 #endif
-#endif
 
 #if defined(ON_WASM_COMPILE)
 using namespace emscripten;

diff --git a/src/bindings/bnd_boundingbox.h b/src/bindings/bnd_boundingbox.h
@@ -3,14 +3,7 @@
 #pragma once
 
 #if defined(ON_PYTHON_COMPILE)
-#if defined(NANOBIND)
-namespace py = nanobind;
-void initBoundingBoxBindings(py::module_& m);
-#else
-namespace py = pybind11;
-void initBoundingBoxBindings(py::module& m);
-#endif
-
+void initBoundingBoxBindings(rh3dmpymodule& m);
 #else
 void initBoundingBoxBindings(void* m);
 #endif