浏览代码

barycentric2global --> barycentric_to_global

Former-commit-id: 42379de31b9de4f448972de638fb89bc16d913bf
Alec Jacobson 11 年之前
父节点
当前提交
3cfd194147
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      include/igl/barycentric_to_global.cpp
  2. 2 2
      include/igl/barycentric_to_global.h
  3. 2 2
      include/igl/embree/project_mesh.h

+ 2 - 2
include/igl/barycentric2global.cpp → include/igl/barycentric_to_global.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 "barycentric2global.h"
+#include "barycentric_to_global.h"
 
 // For error printing
 #include <cstdio>
@@ -14,7 +14,7 @@
 namespace igl
 {
   template <typename Scalar, typename Index>
-  IGL_INLINE Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> barycentric2global(
+  IGL_INLINE Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> barycentric_to_global(
     const Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> & V, 
     const Eigen::Matrix<Index,Eigen::Dynamic,Eigen::Dynamic>  & F, 
     const Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> & bc)

+ 2 - 2
include/igl/barycentric2global.h → include/igl/barycentric_to_global.h

@@ -29,14 +29,14 @@ namespace igl
   // #X: #Xx3 3D coordinates of all points in bc
   template <typename Scalar, typename Index>
   IGL_INLINE Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> 
-    barycentric2global(
+    barycentric_to_global(
       const Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic> & V, 
       const Eigen::Matrix<Index,Eigen::Dynamic,Eigen::Dynamic>   & F, 
       const Eigen::Matrix<Scalar,Eigen::Dynamic,Eigen::Dynamic>  & bc);
 }
 
 #ifndef IGL_STATIC_LIBRARY
-#  include "barycentric2global.cpp"
+#  include "barycentric_to_global.cpp"
 #endif
 
 #endif

+ 2 - 2
include/igl/embree/project_mesh.h

@@ -31,7 +31,7 @@ namespace igl
   //// a vertex of the projected mesh and it has the following format:
   //// id b1 b2. id is the id of a face of the source mesh. b1 and b2 are 
   //// the barycentric coordinates wrt the first two edges of the triangle
-  //// To convert to standard global coordinates, see barycentric2global.h
+  //// To convert to standard global coordinates, see barycentric_to_global.h
   //template <typename ScalarMatrix, typename IndexMatrix>
   //IGL_INLINE ScalarMatrix project_mesh
   //(
@@ -57,7 +57,7 @@ namespace igl
   // a vertex of the projected mesh and it has the following format:
   // id b1 b2. id is the id of a face of the source mesh. b1 and b2 are 
   // the barycentric coordinates wrt the first two edges of the triangle
-  // To convert to standard global coordinates, see barycentric2global.h
+  // To convert to standard global coordinates, see barycentric_to_global.h
   template <typename ScalarMatrix, typename IndexMatrix>
   IGL_INLINE ScalarMatrix project_points_on_mesh
   (