From 54df8bc1df5b541fa7cb3fb45b43356ed78dd3f6 Mon Sep 17 00:00:00 2001 From: Alec Jacobson Date: Tue, 24 Jun 2014 23:29:41 -0400 Subject: [PATCH] boundary_vertices_sorted --> boundary_loop Former-commit-id: 7bb46dbbb639e1398de94e059db962237cb9fc69 --- .../igl/{boundary_vertices_sorted.cpp => boundary_loop.cpp} | 4 ++-- include/igl/{boundary_vertices_sorted.h => boundary_loop.h} | 4 ++-- include/igl/map_vertices_to_circle.cpp | 2 +- include/igl/vector_area_matrix.cpp | 2 +- tutorial/501_HarmonicParam/main.cpp | 4 ++-- tutorial/502_LSCMParam/main.cpp | 4 ++-- tutorial/503_ARAPParam/main.cpp | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename include/igl/{boundary_vertices_sorted.cpp => boundary_loop.cpp} (97%) rename include/igl/{boundary_vertices_sorted.h => boundary_loop.h} (91%) diff --git a/include/igl/boundary_vertices_sorted.cpp b/include/igl/boundary_loop.cpp similarity index 97% rename from include/igl/boundary_vertices_sorted.cpp rename to include/igl/boundary_loop.cpp index ab9c21c7d..aa23031a9 100755 --- a/include/igl/boundary_vertices_sorted.cpp +++ b/include/igl/boundary_loop.cpp @@ -5,12 +5,12 @@ // 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_vertices_sorted.h" +#include "boundary_loop.h" #include "triangle_triangle_adjacency.h" #include "vertex_triangle_adjacency.h" -IGL_INLINE void igl::boundary_vertices_sorted( +IGL_INLINE void igl::boundary_loop( const Eigen::MatrixXd& V, const Eigen::MatrixXi& F, Eigen::VectorXi& b) diff --git a/include/igl/boundary_vertices_sorted.h b/include/igl/boundary_loop.h similarity index 91% rename from include/igl/boundary_vertices_sorted.h rename to include/igl/boundary_loop.h index 609682eaf..3126f9f06 100755 --- a/include/igl/boundary_vertices_sorted.h +++ b/include/igl/boundary_loop.h @@ -23,14 +23,14 @@ namespace igl // F #V by dim list of mesh faces // Outputs: // bnd sorted list of boundary vertex indices - IGL_INLINE void boundary_vertices_sorted( + IGL_INLINE void boundary_loop( const Eigen::MatrixXd& V, const Eigen::MatrixXi& F, Eigen::VectorXi& bnd); } #ifndef IGL_STATIC_LIBRARY -# include "boundary_vertices_sorted.cpp" +# include "boundary_loop.cpp" #endif #endif diff --git a/include/igl/map_vertices_to_circle.cpp b/include/igl/map_vertices_to_circle.cpp index 61364ceee..0fd7913ef 100755 --- a/include/igl/map_vertices_to_circle.cpp +++ b/include/igl/map_vertices_to_circle.cpp @@ -8,7 +8,7 @@ #include "map_vertices_to_circle.h" -#include "boundary_vertices_sorted.h" +#include "boundary_loop.h" IGL_INLINE void igl::map_vertices_to_circle( const Eigen::MatrixXd& V, diff --git a/include/igl/vector_area_matrix.cpp b/include/igl/vector_area_matrix.cpp index 52725a4b5..971a49444 100644 --- a/include/igl/vector_area_matrix.cpp +++ b/include/igl/vector_area_matrix.cpp @@ -12,7 +12,7 @@ #include #include -//#include +//#include #include template diff --git a/tutorial/501_HarmonicParam/main.cpp b/tutorial/501_HarmonicParam/main.cpp index 594565142..6a48f055a 100755 --- a/tutorial/501_HarmonicParam/main.cpp +++ b/tutorial/501_HarmonicParam/main.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) // Find the open boundary Eigen::VectorXi bnd; - igl::boundary_vertices_sorted(V,F,bnd); + igl::boundary_loop(V,F,bnd); // Map the boundary to a circle, preserving edge proportions Eigen::MatrixXd bnd_uv; diff --git a/tutorial/502_LSCMParam/main.cpp b/tutorial/502_LSCMParam/main.cpp index a4586654f..0cbbbf9df 100755 --- a/tutorial/502_LSCMParam/main.cpp +++ b/tutorial/502_LSCMParam/main.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) // Fix two points on the boundary VectorXi bnd,b(2,1); - igl::boundary_vertices_sorted(V,F,bnd); + igl::boundary_loop(V,F,bnd); b(0) = bnd(0); b(1) = bnd(round(bnd.size()/2)); MatrixXd bc(2,2); diff --git a/tutorial/503_ARAPParam/main.cpp b/tutorial/503_ARAPParam/main.cpp index a69a27b02..ba7677a91 100755 --- a/tutorial/503_ARAPParam/main.cpp +++ b/tutorial/503_ARAPParam/main.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) // Compute the initial solution for ARAP (harmonic parametrization) Eigen::VectorXi bnd; - igl::boundary_vertices_sorted(V,F,bnd); + igl::boundary_loop(V,F,bnd); Eigen::MatrixXd bnd_uv; igl::map_vertices_to_circle(V,bnd,bnd_uv);