selfintersect --> remesh_self_intersections

Former-commit-id: e878efbf92f6377d4ed44baf17baab769279eaf5

examples/intersections/example.cpp

@@ -24,7 +24,7 @@
 #include <igl/pathinfo.h>
 #include <igl/Camera.h>
 #include <igl/get_seconds.h>
-#include <igl/cgal/selfintersect.h>
+#include <igl/cgal/remesh_self_intersections.h>
 #include <igl/cgal/intersect_other.h>
 
 #ifdef __APPLE__
@@ -478,9 +478,9 @@ void color_selfintersections(
   MatrixXd SV;
   MatrixXi SF,IF;
   VectorXi J,IM;
-  SelfintersectParam params;
+  RemeshSelfIntersectionsParam params;
   params.detect_only = true;
-  selfintersect(V,F,params,SV,SF,IF,J,IM);
+  remesh_self_intersections(V,F,params,SV,SF,IF,J,IM);
   C.resize(F.rows(),3);
   C.col(0).setConstant(0.4);
   C.col(1).setConstant(0.8);

include/igl/cgal/SelfIntersectMesh.h

@@ -9,7 +9,7 @@
 #define IGL_SELFINTERSECTMESH_H
 
 #include "CGAL_includes.hpp"
-#include "selfintersect.h"
+#include "remesh_self_intersections.h"
 
 #include <Eigen/Dense>
 #include <list>
@@ -81,16 +81,16 @@ namespace igl
       typedef std::map<EMK,EMV> EdgeMap;
       EdgeMap edge2faces;
     public:
-      SelfintersectParam params;
+      RemeshSelfIntersectionsParam params;
     public:
       // Constructs (VV,FF) a new mesh with self-intersections of (V,F)
       // subdivided
       //
-      // See also: selfintersect.h
+      // See also: remesh_self_intersections.h
       inline SelfIntersectMesh(
         const Eigen::MatrixXd & V,
         const Eigen::MatrixXi & F,
-        const SelfintersectParam & params,
+        const RemeshSelfIntersectionsParam & params,
         Eigen::MatrixXd & VV,
         Eigen::MatrixXi & FF,
         Eigen::MatrixXi & IF,
@@ -252,7 +252,7 @@ template <typename Kernel>
 inline igl::SelfIntersectMesh<Kernel>::SelfIntersectMesh(
   const Eigen::MatrixXd & V,
   const Eigen::MatrixXi & F,
-  const SelfintersectParam & params,
+  const RemeshSelfIntersectionsParam & params,
   Eigen::MatrixXd & VV,
   Eigen::MatrixXi & FF,
   Eigen::MatrixXi & IF,

include/igl/cgal/selfintersect.cpp → include/igl/cgal/remesh_self_intersections.cpp

@@ -5,15 +5,15 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#include "selfintersect.h"
+#include "remesh_self_intersections.h"
 #include "SelfIntersectMesh.h"
 #include <igl/C_STR.h>
 #include <list>
 
-IGL_INLINE void igl::selfintersect(
+IGL_INLINE void igl::remesh_self_intersections(
   const Eigen::MatrixXd & V,
   const Eigen::MatrixXi & F,
-  const SelfintersectParam & params,
+  const RemeshSelfIntersectionsParam & params,
   Eigen::MatrixXd & VV,
   Eigen::MatrixXi & FF,
   Eigen::MatrixXi & IF,

include/igl/cgal/selfintersect.h → include/igl/cgal/remesh_self_intersections.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_SELFINTERSECT_H
-#define IGL_SELFINTERSECT_H
+#ifndef IGL_REMESH_SELF_INTERSECTIONS_H
+#define IGL_REMESH_SELF_INTERSECTIONS_H
 #include <igl/igl_inline.h>
 
 #include <Eigen/Dense>
@@ -22,11 +22,11 @@ namespace igl
 {
   // Optional Parameters
   //   DetectOnly  Only compute IF, leave VV and FF alone
-  struct SelfintersectParam
+  struct RemeshSelfIntersectionsParam
   {
     bool detect_only;
     bool first_only;
-    SelfintersectParam():detect_only(false),first_only(false){};
+    RemeshSelfIntersectionsParam():detect_only(false),first_only(false){};
   };
   
   // Given a triangle mesh (V,F) compute a new mesh (VV,FF) which is the same as
@@ -53,10 +53,10 @@ namespace igl
   // any resulting additional vertices along that edge may not get properly
   // connected so that the output mesh has the same global topology. This is
   // because 
-  IGL_INLINE void selfintersect(
+  IGL_INLINE void remesh_self_intersections(
     const Eigen::MatrixXd & V,
     const Eigen::MatrixXi & F,
-    const SelfintersectParam & params,
+    const RemeshSelfIntersectionsParam & params,
     Eigen::MatrixXd & VV,
     Eigen::MatrixXi & FF,
     Eigen::MatrixXi & IF,
@@ -65,7 +65,7 @@ namespace igl
 }
 
 #ifndef IGL_STATIC_LIBRARY
-#  include "selfintersect.cpp"
+#  include "remesh_self_intersections.cpp"
 #endif
   
 #endif