Browse Source

project_points_on_mesh --> line_mesh_intersection

Former-commit-id: 1f74ebeb6cb6ac33774c1db3783537a4b80e2124
Alec Jacobson 11 years ago
parent
commit
ee979dd7bc

+ 4 - 4
include/igl/embree/project_points_on_mesh.cpp → include/igl/embree/line_mesh_intersection.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 "project_points_on_mesh.h"
+#include "line_mesh_intersection.h"
 
 // For error printing
 #include <cstdio>
@@ -15,7 +15,7 @@
 #include <igl/embree/EmbreeIntersector.h>
 
 //template <typename ScalarMatrix, typename IndexMatrix>
-//IGL_INLINE ScalarMatrix igl::project_points_on_mesh(
+//IGL_INLINE ScalarMatrix igl::line_mesh_intersection(
 //   const ScalarMatrix & V_source,
 //   const IndexMatrix  & F_source,
 //   const ScalarMatrix & V_target,
@@ -26,11 +26,11 @@
 //  Eigen::MatrixXd ray_dir;
 //  igl::per_vertex_normals(V_source, F_source, ray_dir);
 //
-//  return project_points_on_mesh(V_source,ray_dir,V_target,F_target);
+//  return line_mesh_intersection(V_source,ray_dir,V_target,F_target);
 //}
 
 template <typename ScalarMatrix, typename IndexMatrix>
-IGL_INLINE ScalarMatrix igl::project_points_on_mesh
+IGL_INLINE ScalarMatrix igl::line_mesh_intersection
 (
  const ScalarMatrix & V_source,
  const ScalarMatrix  & N_source,

+ 5 - 5
include/igl/embree/project_points_on_mesh.h → include/igl/embree/line_mesh_intersection.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_PROJECTMESH_H
-#define IGL_PROJECTMESH_H
+#ifndef IGL_LINE_MESH_INTERSECTION_H
+#define IGL_LINE_MESH_INTERSECTION_H
 #include <igl/igl_inline.h>
 
 #include <Eigen/Dense>
@@ -33,7 +33,7 @@ namespace igl
   //// the barycentric coordinates wrt the first two edges of the triangle
   //// To convert to standard global coordinates, see barycentric_to_global.h
   //template <typename ScalarMatrix, typename IndexMatrix>
-  //IGL_INLINE ScalarMatrix project_points_on_mesh
+  //IGL_INLINE ScalarMatrix line_mesh_intersection
   //(
 	//	const ScalarMatrix & V_source,
   //	const IndexMatrix  & F_source,
@@ -59,7 +59,7 @@ namespace igl
   // the barycentric coordinates wrt the first two edges of the triangle
   // To convert to standard global coordinates, see barycentric_to_global.h
   template <typename ScalarMatrix, typename IndexMatrix>
-  IGL_INLINE ScalarMatrix project_points_on_mesh
+  IGL_INLINE ScalarMatrix line_mesh_intersection
   (
    const ScalarMatrix & V_source,
    const ScalarMatrix  & N_source,
@@ -69,7 +69,7 @@ namespace igl
 
 }
 #ifndef IGL_STATIC_LIBRARY
-#  include "project_points_on_mesh.cpp"
+#  include "line_mesh_intersection.cpp"
 #endif
 
 #endif