Browse Source

Rename is_inside(...) functions to avoid name shaddowing.

Former-commit-id: 44259f0db82241ca830f6605e4abf9ae03a4ffb3
Qingnan Zhou 9 years ago
parent
commit
47249df3d3
3 changed files with 7 additions and 7 deletions
  1. 4 4
      include/igl/cgal/is_inside.cpp
  2. 2 2
      include/igl/cgal/is_inside.h
  3. 1 1
      include/igl/cgal/outer_hull.cpp

+ 4 - 4
include/igl/cgal/is_inside.cpp

@@ -277,7 +277,7 @@ IGL_INLINE bool igl::cgal::is_inside(
             (V1(f[0],1) + V1(f[1],1) + V1(f[2],1))/3.0,
             (V1(f[0],2) + V1(f[1],2) + V1(f[2],2))/3.0);
     Eigen::VectorXi inside;
-    igl::cgal::is_inside(V2, F2, I2, query, inside);
+    igl::cgal::is_inside_batch(V2, F2, I2, query, inside);
     assert(inside.size() == 1);
     return inside[0];
 }
@@ -296,7 +296,7 @@ IGL_INLINE bool igl::cgal::is_inside(
 
 template<typename DerivedV, typename DerivedF, typename DerivedI,
     typename DerivedP, typename DerivedB>
-IGL_INLINE void igl::cgal::is_inside(
+IGL_INLINE void igl::cgal::is_inside_batch(
         const Eigen::PlainObjectBase<DerivedV>& V,
         const Eigen::PlainObjectBase<DerivedF>& F,
         const Eigen::PlainObjectBase<DerivedI>& I,
@@ -356,12 +356,12 @@ IGL_INLINE void igl::cgal::is_inside(
 
 template<typename DerivedV, typename DerivedF, typename DerivedP,
     typename DerivedB>
-IGL_INLINE void igl::cgal::is_inside(
+IGL_INLINE void igl::cgal::is_inside_batch(
         const Eigen::PlainObjectBase<DerivedV>& V,
         const Eigen::PlainObjectBase<DerivedF>& F,
         const Eigen::PlainObjectBase<DerivedP>& P,
         Eigen::PlainObjectBase<DerivedB>& inside) {
     Eigen::VectorXi I(F.rows());
     I.setLinSpaced(F.rows(), 0, F.rows()-1);
-    igl::cgal::is_inside(V, F, I, P, inside);
+    igl::cgal::is_inside_batch(V, F, I, P, inside);
 }

+ 2 - 2
include/igl/cgal/is_inside.h

@@ -59,7 +59,7 @@ namespace igl {
         //           query point is inside of the mesh.
         template<typename DerivedV, typename DerivedF, typename DerivedI,
             typename DerivedP, typename DerivedB>
-            IGL_INLINE void is_inside(
+            IGL_INLINE void is_inside_batch(
                     const Eigen::PlainObjectBase<DerivedV>& V,
                     const Eigen::PlainObjectBase<DerivedF>& F,
                     const Eigen::PlainObjectBase<DerivedI>& I,
@@ -68,7 +68,7 @@ namespace igl {
 
         template<typename DerivedV, typename DerivedF, typename DerivedP,
             typename DerivedB>
-            IGL_INLINE void is_inside(
+            IGL_INLINE void is_inside_batch(
                     const Eigen::PlainObjectBase<DerivedV>& V,
                     const Eigen::PlainObjectBase<DerivedF>& F,
                     const Eigen::PlainObjectBase<DerivedP>& P,

+ 1 - 1
include/igl/cgal/outer_hull.cpp

@@ -401,7 +401,7 @@ IGL_INLINE void igl::cgal::outer_hull(
         query_points(i,2) = (V(f(0,0), 2) + V(f(0,1), 2) + V(f(0,2), 2))/3.0;
     }
     Eigen::VectorXi inside;
-    igl::cgal::is_inside(V, vG[id], query_points, inside);
+    igl::cgal::is_inside_batch(V, vG[id], query_points, inside);
     assert(inside.size() == num_unresolved_components);
     for (size_t i=0; i<num_unresolved_components; i++) {
         if (inside[i]) {