Sfoglia il codice sorgente

boundary_faces --> boundary_facets

Former-commit-id: f88c0785cb679944ae4983b07507ea21c6be2792
Alec Jacobson 11 anni fa
parent
commit
99c27dfd3f

+ 1 - 1
examples/ambient-occlusion/example.cpp

@@ -357,7 +357,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/colored-mesh/example.cpp

@@ -530,7 +530,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/flare-eyes/example.cpp

@@ -662,7 +662,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/intersections/example.cpp

@@ -607,7 +607,7 @@ int main(int argc, char * argv[])
     //  }
     //  //if(F.size() > T.size() || F.size() == 0)
     //  {
-    //    boundary_faces(T,F);
+    //    boundary_facets(T,F);
     //  }
     }
     if(vV.size() > 0)

+ 1 - 1
examples/patches/example.cpp

@@ -759,7 +759,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 2 - 2
examples/quicklook-mesh/src/render_to_buffer.cpp

@@ -18,7 +18,7 @@ extern "C" {
 #include <igl/polygon_mesh_to_triangle_mesh.h>
 #include <igl/readOFF.h>
 #include <igl/readMESH.h>
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 #include <igl/barycenter.h>
 #include <igl/doublearea.h>
 #include <igl/EPS.h>
@@ -395,7 +395,7 @@ bool render_to_buffer(
     }
     //if(F.size() > T.size() || F.size() == 0)
     {
-      boundary_faces(T,F);
+      boundary_facets(T,F);
     }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/randomly-sample-mesh/example.cpp

@@ -546,7 +546,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/rotate-widget/example.cpp

@@ -574,7 +574,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/scene-rotation/example.cpp

@@ -629,7 +629,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
examples/skeleton/example.cpp

@@ -632,7 +632,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 2 - 2
examples/upright/example.cpp

@@ -339,7 +339,7 @@ bool save()
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   cout<<GREENGIN("Current baked model written to "+out_filename+".")<<endl;
@@ -502,7 +502,7 @@ int main(int argc, char * argv[])
   //  }
   //  //if(F.size() > T.size() || F.size() == 0)
   //  {
-  //    boundary_faces(T,F);
+  //    boundary_facets(T,F);
   //  }
   }
   if(vV.size() > 0)

+ 1 - 1
include/igl/WindingNumberTree.h

@@ -140,7 +140,7 @@ inline igl::WindingNumberTree<Point>::WindingNumberTree(
   V(dummyV),
   SV(),
   F(),
-  //boundary(igl::boundary_faces<Eigen::MatrixXi,Eigen::MatrixXi>(F))
+  //boundary(igl::boundary_facets<Eigen::MatrixXi,Eigen::MatrixXi>(F))
   cap(),
   radius(std::numeric_limits<double>::infinity()),
   center(0,0,0)

+ 10 - 10
include/igl/boundary_faces.cpp → include/igl/boundary_facets.cpp

@@ -5,7 +5,7 @@
 // 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 "boundary_faces.h"
+#include "boundary_facets.h"
 #include "face_occurences.h"
 
 // IGL includes
@@ -16,7 +16,7 @@
 #include <iostream>
 
 template <typename IntegerT, typename IntegerF>
-IGL_INLINE void igl::boundary_faces(
+IGL_INLINE void igl::boundary_facets(
   const std::vector<std::vector<IntegerT> > & T,
   std::vector<std::vector<IntegerF> > & F)
 {
@@ -104,7 +104,7 @@ IGL_INLINE void igl::boundary_faces(
 #include "matrix_to_list.h"
 
 template <typename DerivedT, typename DerivedF>
-IGL_INLINE void igl::boundary_faces(
+IGL_INLINE void igl::boundary_facets(
   const Eigen::PlainObjectBase<DerivedT>& T,
   Eigen::PlainObjectBase<DerivedF>& F)
 {
@@ -116,16 +116,16 @@ IGL_INLINE void igl::boundary_faces(
   vector<vector<typename Eigen::PlainObjectBase<DerivedT>::Scalar> > vT;
   matrix_to_list(T,vT);
   vector<vector<typename Eigen::PlainObjectBase<DerivedF>::Scalar> > vF;
-  boundary_faces(vT,vF);
+  boundary_facets(vT,vF);
   list_to_matrix(vF,F);
 }
 
 template <typename DerivedT, typename Ret>
-Ret igl::boundary_faces(
+Ret igl::boundary_facets(
   const Eigen::PlainObjectBase<DerivedT>& T)
 {
   Ret F; 
-  igl::boundary_faces(T,F);
+  igl::boundary_facets(T,F);
   return F;
 }
 #endif
@@ -133,9 +133,9 @@ Ret igl::boundary_faces(
 
 #ifdef IGL_STATIC_LIBRARY
 // Explicit template specialization
-template void igl::boundary_faces<Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&);
-template void igl::boundary_faces<int, int>(std::vector<std::vector<int, std::allocator<int> >, std::allocator<std::vector<int, std::allocator<int> > > > const&, std::vector<std::vector<int, std::allocator<int> >, std::allocator<std::vector<int, std::allocator<int> > > >&);
-//template Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > igl::boundary_faces(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&);
-template Eigen::Matrix<int, -1, -1, 0, -1, -1> igl::boundary_faces<Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&);
+template void igl::boundary_facets<Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&);
+template void igl::boundary_facets<int, int>(std::vector<std::vector<int, std::allocator<int> >, std::allocator<std::vector<int, std::allocator<int> > > > const&, std::vector<std::vector<int, std::allocator<int> >, std::allocator<std::vector<int, std::allocator<int> > > >&);
+//template Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > igl::boundary_facets(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&);
+template Eigen::Matrix<int, -1, -1, 0, -1, -1> igl::boundary_facets<Eigen::Matrix<int, -1, -1, 0, -1, -1>, Eigen::Matrix<int, -1, -1, 0, -1, -1> >(Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> > const&);
 #endif
 

+ 4 - 4
include/igl/boundary_faces.h → include/igl/boundary_facets.h

@@ -30,7 +30,7 @@ namespace igl
   //
   //
   template <typename IntegerT, typename IntegerF>
-  IGL_INLINE void boundary_faces(
+  IGL_INLINE void boundary_facets(
     const std::vector<std::vector<IntegerT> > & T,
     std::vector<std::vector<IntegerF> > & F);
 
@@ -39,18 +39,18 @@ namespace igl
   //   DerivedT  integer-value: i.e. from MatrixXi
   //   DerivedF  integer-value: i.e. from MatrixXi
   template <typename DerivedT, typename DerivedF>
-  IGL_INLINE void boundary_faces(
+  IGL_INLINE void boundary_facets(
     const Eigen::PlainObjectBase<DerivedT>& T,
     Eigen::PlainObjectBase<DerivedF>& F);
   // Same as above but returns F
   template <typename DerivedT, typename Ret>
-  Ret boundary_faces(
+  Ret boundary_facets(
     const Eigen::PlainObjectBase<DerivedT>& T);
 #endif
 }
 
 #ifndef IGL_STATIC_LIBRARY
-#  include "boundary_faces.cpp"
+#  include "boundary_facets.cpp"
 #endif
 
 #endif

+ 2 - 2
include/igl/tetgen/tetrahedralize.cpp

@@ -12,7 +12,7 @@
 // IGL includes 
 #include <igl/matrix_to_list.h>
 #include <igl/list_to_matrix.h>
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 
 // STL includes
 #include <cassert>
@@ -55,7 +55,7 @@ IGL_INLINE int igl::tetrahedralize(
   {
     return -1;
   }
-  boundary_faces(TT,TF);
+  boundary_facets(TT,TF);
   return 0;
 }
 

+ 2 - 2
include/igl/vector_area_matrix.cpp

@@ -13,7 +13,7 @@
 #include <unsupported/Eigen/SparseExtra>
 
 //#include <igl/boundary_vertices_sorted.h>
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 
 template <typename DerivedF, typename Scalar>
 IGL_INLINE void igl::vector_area_matrix(
@@ -33,7 +33,7 @@ IGL_INLINE void igl::vector_area_matrix(
 	vector<Triplet<Scalar> > auxTTripletList;
 
   MatrixXi E;
-  boundary_faces(F,E);
+  boundary_facets(F,E);
 
 	for(int k = 0; k < E.rows(); k++)
   {

+ 2 - 2
tutorial/303_LaplaceEquation/main.cpp

@@ -1,4 +1,4 @@
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 #include <igl/colon.h>
 #include <igl/cotmatrix.h>
 #include <igl/jet.h>
@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
   igl::readOFF("../shared/camelhead.off",V,F);
   // Find boundary edges
   MatrixXi E;
-  igl::boundary_faces(F,E);
+  igl::boundary_facets(F,E);
   // Find boundary vertices
   VectorXi b,IA,IC;
   igl::unique(E,b,IA,IC);

+ 1 - 1
tutorial/304_LinearEqualityConstraints/main.cpp

@@ -1,4 +1,4 @@
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 #include <igl/cotmatrix.h>
 #include <igl/invert_diag.h>
 #include <igl/jet.h>

+ 1 - 1
tutorial/305_QuadraticProgramming/main.cpp

@@ -1,5 +1,5 @@
 #include <igl/active_set.h>
-#include <igl/boundary_faces.h>
+#include <igl/boundary_facets.h>
 #include <igl/cotmatrix.h>
 #include <igl/invert_diag.h>
 #include <igl/jet.h>