Merge pull request #1727 from DGtal-team/rawWinding

Exposing winding number values

ChangeLog.md

@@ -38,7 +38,9 @@
   - Add method to remove isolated vertices in Mesh, improve obj
     material reading from potential obsolete path. (Bertrand Kerautret,
     [#1709](https://github.com/DGtal-team/DGtal/issues/1709))
-  - Update of the WindingNumber constructor to allow external computation of point areas
+  - Update of the WindingNumberShape constructor to allow external computation of point areas
+    (David Coeurjolly,[#1719](https://github.com/DGtal-team/DGtal/issues/1719))
+  - the WindingNumberShape class can output the raw winding number values
     (David Coeurjolly,[#1719](https://github.com/DGtal-team/DGtal/issues/1719))
 
 

src/DGtal/shapes/WindingNumbersShape.h

@@ -172,14 +172,9 @@ namespace DGtal
     {
       Eigen::VectorXd W;
       std::vector<Orientation> results( queries.rows(), DGtal::OUTSIDE );
-      Eigen::MatrixXd O_CM;
-      Eigen::VectorXd O_R;
-      Eigen::MatrixXd O_EC;
-
-      //Checking if the areas
-      igl::fast_winding_number(*myPoints,*myNormals,myPointAreas,myO_PI,myO_CH,2,O_CM,O_R,O_EC);
-      igl::fast_winding_number(*myPoints,*myNormals,myPointAreas,myO_PI,myO_CH,O_CM,O_R,O_EC,queries,2,W);
-
+
+      rawWindingNumberBatch(queries, W);
+
       //Reformating the output
       for(auto i=0u; i < queries.rows(); ++i)
       {
@@ -194,6 +189,23 @@ namespace DGtal
       return results;
     }
 
+
+    /// Returns the raw value of the Winding Number funciton at a set of points (queries).
+    ///
+    /// @param queries [in] a "nx3" matrix with the query points in space.
+    /// @param W [out] a vector with all windung number values.
+    void rawWindingNumberBatch(const Eigen::MatrixXd & queries,
+                               Eigen::VectorXd &W) const
+    {
+      Eigen::MatrixXd O_CM;
+      Eigen::VectorXd O_R;
+      Eigen::MatrixXd O_EC;
+
+      //Checking if the areas
+      igl::fast_winding_number(*myPoints,*myNormals,myPointAreas,myO_PI,myO_CH,2,O_CM,O_R,O_EC);
+      igl::fast_winding_number(*myPoints,*myNormals,myPointAreas,myO_PI,myO_CH,O_CM,O_R,O_EC,queries,2,W);
+    }
+
     ///Const alias to the points
     CountedConstPtrOrConstPtr<Eigen::MatrixXd> myPoints;
     ///Const alias to the normals