瀏覽代碼

fix incorrect header

Former-commit-id: 373eee9c9c889d92078b1c6fb5c89f703182eacb
Alec Jacobson 6 年之前
父節點
當前提交
0b1b87a3d1
共有 1 個文件被更改,包括 65 次插入52 次删除
  1. 65 52
      include/igl/copyleft/cgal/fast_winding_number.h

+ 65 - 52
include/igl/copyleft/cgal/fast_winding_number.h

@@ -5,58 +5,71 @@
 #include <vector>
 namespace igl
 {
-  // Evaluate the fast winding number for point data, without known areas. The
-  // areas are calculated using igl::knn and igl::copyleft::cgal::point_areas.
-  //
-  // This function performes the precomputation and evaluation all in one.
-  // If you need to acess the precomuptation for repeated evaluations, use the
-  // two functions designed for exposed precomputation, which are the first two
-  // functions see in igl/fast_winding_number.h
-  //
-  // Inputs:
-  //   P  #P by 3 list of point locations
-  //   N  #P by 3 list of point normals
-  //   Q  #Q by 3 list of query points for the winding number
-  //   beta  This is a Barnes-Hut style accuracy term that separates near feild
-  //         from far field. The higher the beta, the more accurate and slower
-  //         the evaluation. We reccommend using a beta value of 2.
-  //   expansion_order    the order of the taylor expansion. We support 0,1,2.
-  // Outputs:
-  //   WN  #Q by 1 list of windinng number values at each query point
-  //
-  template <typename DerivedP, typename DerivedN, typename DerivedQ,
-    typename BetaType, typename DerivedWN>
-  IGL_INLINE void fast_winding_number(const Eigen::MatrixBase<DerivedP>& P,
-                                      const Eigen::MatrixBase<DerivedN>& N,
-                                      const Eigen::MatrixBase<DerivedQ>& Q,
-                                      const int expansion_order,
-                                      const BetaType beta,
-                                      Eigen::PlainObjectBase<DerivedWN>& WN
-                                      );
-  
-  // Evaluate the fast winding number for point data, without known areas. The
-  // areas are calculated using igl::knn and
-  // igl::point_areas. This function uses the default expansion
-  // order and beta (both are set to 2).
-  //
-  // This function performes the precomputation and evaluation all in one.
-  // If you need to acess the precomuptation for repeated evaluations, use the
-  // two functions designed for exposed precomputation (described above).
-  
-  // Inputs:
-  //   P  #P by 3 list of point locations
-  //   N  #P by 3 list of point normals
-  //   Q  #Q by 3 list of query points for the winding number
-  // Outputs:
-  //   WN  #Q by 1 list of windinng number values at each query point
-  //
-  template <typename DerivedP, typename DerivedN, typename DerivedQ,
-    typename DerivedWN>
-  IGL_INLINE void fast_winding_number(const Eigen::MatrixBase<DerivedP>& P,
-                                      const Eigen::MatrixBase<DerivedN>& N,
-                                      const Eigen::MatrixBase<DerivedQ>& Q,
-                                      Eigen::PlainObjectBase<DerivedWN>& WN
-                                      );
+  namespace copyleft
+  {
+    namespace cgal
+    {
+    // Evaluate the fast winding number for point data, without known areas. The
+    // areas are calculated using igl::knn and igl::copyleft::cgal::point_areas.
+    //
+    // This function performes the precomputation and evaluation all in one.
+    // If you need to acess the precomuptation for repeated evaluations, use the
+    // two functions designed for exposed precomputation, which are the first two
+    // functions see in igl/fast_winding_number.h
+    //
+    // Inputs:
+    //   P  #P by 3 list of point locations
+    //   N  #P by 3 list of point normals
+    //   Q  #Q by 3 list of query points for the winding number
+    //   beta  This is a Barnes-Hut style accuracy term that separates near feild
+    //         from far field. The higher the beta, the more accurate and slower
+    //         the evaluation. We reccommend using a beta value of 2.
+    //   expansion_order    the order of the taylor expansion. We support 0,1,2.
+    // Outputs:
+    //   WN  #Q by 1 list of windinng number values at each query point
+    //
+    template <
+      typename DerivedP, 
+      typename DerivedN, 
+      typename DerivedQ,
+      typename BetaType, 
+      typename DerivedWN>
+    IGL_INLINE void fast_winding_number(
+      const Eigen::MatrixBase<DerivedP>& P,
+      const Eigen::MatrixBase<DerivedN>& N,
+      const Eigen::MatrixBase<DerivedQ>& Q,
+      const int expansion_order,
+      const BetaType beta,
+      Eigen::PlainObjectBase<DerivedWN>& WN);
+    
+    // Evaluate the fast winding number for point data, without known areas. The
+    // areas are calculated using igl::knn and
+    // igl::point_areas. This function uses the default expansion
+    // order and beta (both are set to 2).
+    //
+    // This function performes the precomputation and evaluation all in one.
+    // If you need to acess the precomuptation for repeated evaluations, use the
+    // two functions designed for exposed precomputation (described above).
+    
+    // Inputs:
+    //   P  #P by 3 list of point locations
+    //   N  #P by 3 list of point normals
+    //   Q  #Q by 3 list of query points for the winding number
+    // Outputs:
+    //   WN  #Q by 1 list of windinng number values at each query point
+    //
+    template <
+      typename DerivedP, 
+      typename DerivedN, 
+      typename DerivedQ, 
+      typename DerivedWN>
+    IGL_INLINE void fast_winding_number(
+      const Eigen::MatrixBase<DerivedP>& P,
+      const Eigen::MatrixBase<DerivedN>& N,
+      const Eigen::MatrixBase<DerivedQ>& Q,
+      Eigen::PlainObjectBase<DerivedWN>& WN);
+    }
+  }
 }
 #ifndef IGL_STATIC_LIBRARY
 #  include "fast_winding_number.cpp"