moved CGALS's rational interface outside of AFM's folder

mlivesu · May 27, 2024 · ab742a4 · ab742a4
1 parent 70aa8ba
commit ab742a4
Show file tree

Hide file tree

Showing 7 changed files with 3,414 additions and 31 deletions.
diff --git a/cinolib-config.cmake b/cinolib-config.cmake
@@ -172,6 +172,8 @@ if(CINOLIB_USES_CGAL)
     if(CGAL_FOUND)
         target_link_libraries(cinolib INTERFACE CGAL::CGAL)
         target_compile_definitions(cinolib INTERFACE CINOLIB_USES_CGAL)
+        # thin wrapper for MPFR (https://github.com/advanpix/mpreal)
+        target_include_directories(cinolib INTERFACE ${cinolib_DIR}/external/mpreal/)
     else()
         message("Could not find CGAL!")
         set(CINOLIB_USES_CGAL OFF)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CINOLIB_USES_SHEWCHUK_PREDICATES  ON )
 set(CINOLIB_USES_INDIRECT_PREDICATES  ON )
 set(CINOLIB_USES_GRAPH_CUT            OFF)
 set(CINOLIB_USES_BOOST                OFF)
-set(CINOLIB_USES_VTK                  ON ) # optional, if added VTK formats will be supported everywhere
+set(CINOLIB_USES_VTK                  OFF) # optional, if added VTK formats will be supported everywhere
 set(CINOLIB_USES_SPECTRA              ON )
 set(CINOLIB_USES_CGAL                 ON )
 

diff --git a/external/mpreal/mpreal.h b/external/mpreal/mpreal.h
diff --git a/include/cinolib/AFM/AFM.h b/include/cinolib/AFM/AFM.h
@@ -39,7 +39,7 @@
 #ifdef CINOLIB_USES_CGAL
 
 #include <cinolib/meshes/drawable_trimesh.h>
-#include <cinolib/AFM/rationals.h>
+#include <cinolib/rationals.h>
 #include <cinolib/profiler.h>
 
 namespace cinolib

diff --git a/include/cinolib/AFM/flip_checks.cpp b/include/cinolib/AFM/flip_checks.cpp
@@ -34,7 +34,7 @@
 *     Italy                                                                     *
 *********************************************************************************/
 #include <cinolib/AFM/flip_checks.h>
-#include <cinolib/AFM/rationals.h>
+#include <cinolib/rationals.h>
 #include <cinolib/predicates.h>
 
 namespace cinolib

diff --git a/include/cinolib/AFM/rationals.cpp → include/cinolib/rationals.cpp b/include/cinolib/AFM/rationals.cpp → include/cinolib/rationals.cpp
@@ -33,7 +33,7 @@
 *     16149 Genoa,                                                              *
 *     Italy                                                                     *
 *********************************************************************************/
-#include <cinolib/AFM/rationals.h>
+#include <cinolib/rationals.h>
 #include <cinolib/predicates.h>
 
 namespace cinolib
@@ -65,21 +65,22 @@ bool rationals_are_working()
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+template <class T>
 CINO_INLINE
-CGAL_Q orient3d(const CGAL_Q * pa,
-                const CGAL_Q * pb,
-                const CGAL_Q * pc,
-                const CGAL_Q * pd)
+T orient3d(const T * pa,
+           const T * pb,
+           const T * pc,
+           const T * pd)
 {
-    CGAL_Q adx = pa[0] - pd[0];
-    CGAL_Q bdx = pb[0] - pd[0];
-    CGAL_Q cdx = pc[0] - pd[0];
-    CGAL_Q ady = pa[1] - pd[1];
-    CGAL_Q bdy = pb[1] - pd[1];
-    CGAL_Q cdy = pc[1] - pd[1];
-    CGAL_Q adz = pa[2] - pd[2];
-    CGAL_Q bdz = pb[2] - pd[2];
-    CGAL_Q cdz = pc[2] - pd[2];
+    T adx = pa[0] - pd[0];
+    T bdx = pb[0] - pd[0];
+    T cdx = pc[0] - pd[0];
+    T ady = pa[1] - pd[1];
+    T bdy = pb[1] - pd[1];
+    T cdy = pc[1] - pd[1];
+    T adz = pa[2] - pd[2];
+    T bdz = pb[2] - pd[2];
+    T cdz = pc[2] - pd[2];
 
     return adx * (bdy * cdz - bdz * cdy)
          + bdx * (cdy * adz - cdz * ady)
@@ -88,15 +89,16 @@ CGAL_Q orient3d(const CGAL_Q * pa,
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+template <class T>
 CINO_INLINE
-CGAL_Q orient2d(const CGAL_Q * pa,
-                const CGAL_Q * pb,
-                const CGAL_Q * pc)
+T orient2d(const T * pa,
+           const T * pb,
+           const T * pc)
 {
-    CGAL_Q acx = pa[0] - pc[0];
-    CGAL_Q bcx = pb[0] - pc[0];
-    CGAL_Q acy = pa[1] - pc[1];
-    CGAL_Q bcy = pb[1] - pc[1];
+    T acx = pa[0] - pc[0];
+    T bcx = pb[0] - pc[0];
+    T acy = pa[1] - pc[1];
+    T bcy = pb[1] - pc[1];
 
     return acx * bcy - acy * bcx;
 }

diff --git a/include/cinolib/AFM/rationals.h → include/cinolib/rationals.h b/include/cinolib/AFM/rationals.h → include/cinolib/rationals.h
@@ -50,18 +50,20 @@ typedef CGAL::Lazy_exact_nt<CGAL::Gmpq> CGAL_Q;
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+template <class T>
 CINO_INLINE
-CGAL_Q orient3d(const CGAL_Q * pa,
-                const CGAL_Q * pb,
-                const CGAL_Q * pc,
-                const CGAL_Q * pd);
+T orient3d(const T * pa,
+           const T * pb,
+           const T * pc,
+           const T * pd);
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
+template <class T>
 CINO_INLINE
-CGAL_Q orient2d(const CGAL_Q * pa,
-                const CGAL_Q * pb,
-                const CGAL_Q * pc);
+T orient2d(const T * pa,
+           const T * pb,
+           const T * pc);
 
 //::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::