Merge branch 'main' into ogc

Author: zfergus

python/src/CMakeLists.txt

@@ -18,7 +18,9 @@ add_subdirectory(ccd)
 add_subdirectory(collisions)
 add_subdirectory(distance)
 add_subdirectory(friction)
+add_subdirectory(geometry)
 add_subdirectory(implicits)
+add_subdirectory(math)
 add_subdirectory(ogc)
 add_subdirectory(potentials)
 add_subdirectory(tangent)

python/src/bindings.cpp

@@ -90,9 +90,18 @@ PYBIND11_MODULE(ipctk, m)
 
     define_smooth_potential(m);
 
+    // geometry
+    define_angle(m);
+    define_area(m);
+    define_intersection(m);
+    define_normal(m);
+
     // implicits
     define_plane_implicit(m);
 
+    // math
+    define_interval(m);
+
     // ogc
     py::module_ ogc =
         m.def_submodule("ogc", "Offset Geometric Contact (OGC) helpers");
@@ -108,9 +117,6 @@ PYBIND11_MODULE(ipctk, m)
     define_tangential_adhesion_potential(m);
 
     // utils
-    define_area_gradient(m);
-    define_interval(m);
-    define_intersection(m);
     define_logger(m);
     define_thread_limiter(m);
     define_vertex_to_min_edge(m);

python/src/bindings.hpp

@@ -8,7 +8,9 @@
 #include <collisions/bindings.hpp>
 #include <distance/bindings.hpp>
 #include <friction/bindings.hpp>
+#include <geometry/bindings.hpp>
 #include <implicits/bindings.hpp>
+#include <math/bindings.hpp>
 #include <ogc/bindings.hpp>
 #include <potentials/bindings.hpp>
 #include <tangent/bindings.hpp>

python/src/geometry/CMakeLists.txt

@@ -0,0 +1,8 @@
+set(SOURCES
+  area.cpp
+  angle.cpp
+  normal.cpp
+  intersection.cpp
+)
+
+target_sources(ipctk PRIVATE ${SOURCES})

python/src/geometry/angle.cpp

@@ -0,0 +1,60 @@
+#include <common.hpp>
+
+#include <ipc/geometry/angle.hpp>
+
+using namespace ipc;
+
+void define_angle(py::module_& m)
+{
+    m.def(
+        "dihedral_angle", &dihedral_angle,
+        R"ipc_Qu8mg5v7(
+            Compute the bending angle between two triangles sharing an edge.
+                x0---x2
+                 | \ |
+                x1---x3
+
+            Parameters
+            ----------
+            x0 : Eigen::Vector3d
+                The first vertex of the edge.
+            x1 : Eigen::Vector3d
+                The second vertex of the edge.
+            x2 : Eigen::Vector3d
+                The opposite vertex of the first triangle.
+            x3 : Eigen::Vector3d
+                The opposite vertex of the second triangle.
+
+            Returns
+            -------
+            double
+                The bending angle between the two triangles.
+        )ipc_Qu8mg5v7",
+        py::arg("x0"), py::arg("x1"), py::arg("x2"), py::arg("x3"));
+
+    m.def(
+        "dihedral_angle_gradient", &dihedral_angle_gradient,
+        R"ipc_Qu8mg5v7(
+            Compute the Jacobian of the bending angle between two triangles sharing an edge.
+                x0---x2
+                 | \ |
+                x1---x3
+
+            Parameters
+            ----------
+            x0 : Eigen::Vector3d
+                The first vertex of the edge.
+            x1 : Eigen::Vector3d
+                The second vertex of the edge.
+            x2 : Eigen::Vector3d
+                The opposite vertex of the first triangle.
+            x3 : Eigen::Vector3d
+                The opposite vertex of the second triangle.
+
+            Returns
+            -------
+            Eigen::Vector<double, 12>
+                The Jacobian matrix of the bending angle with respect to the input vertices.
+        )ipc_Qu8mg5v7",
+        py::arg("x0"), py::arg("x1"), py::arg("x2"), py::arg("x3"));
+}

python/src/utils/area_gradient.cpp renamed to python/src/geometry/area.cpp

@@ -1,11 +1,11 @@
 #include <common.hpp>
 
-#include <ipc/utils/area_gradient.hpp>
+#include <ipc/geometry/area.hpp>
 #include <ipc/utils/eigen_ext.hpp>
 
 using namespace ipc;
 
-void define_area_gradient(py::module_& m)
+void define_area(py::module_& m)
 {
     m.def(
         "edge_length_gradient", &edge_length_gradient,

python/src/geometry/bindings.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <pybind11/pybind11.h>
+
+void define_angle(py::module_& m);
+void define_area(py::module_& m);
+void define_normal(py::module_& m);
+void define_intersection(py::module_& m);

python/src/utils/intersection.cpp renamed to python/src/geometry/intersection.cpp

@@ -1,6 +1,6 @@
 #include <common.hpp>
 
-#include <ipc/utils/intersection.hpp>
+#include <ipc/geometry/intersection.hpp>
 
 #include <igl/predicates/segment_segment_intersect.h>