bugfix in reorient_facets_raycast

Former-commit-id: 93d7ff73b697f8daba0738b86b51d7a9aacdffad

include/igl/embree/reorient_facets_raycast.cpp

@@ -17,19 +17,21 @@
 #include <ctime>
 #include <limits>
 
-  template <
-    typename DerivedV, 
-    typename DerivedF, 
-    typename DerivedI>
-  IGL_INLINE void igl::reorient_facets_raycast(
-    const Eigen::PlainObjectBase<DerivedV> & V,
-    const Eigen::PlainObjectBase<DerivedF> & F,
-    int rays_total,
-    int rays_minimum,
-    bool facet_wise,
-    bool use_parity,
-    bool is_verbose,
-    Eigen::PlainObjectBase<DerivedI> & I)
+template <
+  typename DerivedV, 
+  typename DerivedF, 
+  typename DerivedI,
+  typename DerivedC>
+IGL_INLINE void igl::reorient_facets_raycast(
+  const Eigen::PlainObjectBase<DerivedV> & V,
+  const Eigen::PlainObjectBase<DerivedF> & F,
+  int rays_total,
+  int rays_minimum,
+  bool facet_wise,
+  bool use_parity,
+  bool is_verbose,
+  Eigen::PlainObjectBase<DerivedI> & I,
+  Eigen::PlainObjectBase<DerivedC> & C)
 {
   using namespace Eigen;
   using namespace std;
@@ -39,7 +41,6 @@
   // number of faces
   const int m = F.rows();
   
-  VectorXi C;
   MatrixXi FF = F;
   if (facet_wise) {
     C.resize(m);
@@ -65,11 +66,6 @@
   // face area
   Matrix<typename DerivedV::Scalar,Dynamic,1> A;
   doublearea(V,FF,A);
-  double area_min = numeric_limits<double>::max();
-  for (int f = 0; f < m; ++f)
-  {
-    area_min = A(f) != 0 && A(f) < area_min ? A(f) : area_min;
-  }
   double area_total = A.sum();
   
   // determine number of rays per component according to its area
@@ -104,18 +100,17 @@
       continue;
     }
     vector<int> CF;     // set of faces per component
-    vector<unsigned long long> CF_area;
+    vector<double> CF_area;
     for (int f = 0; f < m; ++f)
     {
       if (C(f)==c)
       {
         CF.push_back(f);
-        CF_area.push_back(static_cast<unsigned long long>(100 * A(f) / area_min));
+        CF_area.push_back(A(f));
       }
     }
     // discrete distribution for random selection of faces with probability proportional to their areas
-    auto ddist_func = [&] (double i) { return CF_area[static_cast<int>(i)]; };
-    discrete_distribution<int> ddist(CF.size(), 0, CF.size(), ddist_func);      // simple ctor of (Iter, Iter) not provided by the stupid VC11 impl...
+    discrete_distribution<int> ddist(CF.size(), 0, CF.size(), [&](double i){ return CF_area[static_cast<int>(i)]; });       // simple ctor of (Iter, Iter) not provided by the stupid VC11/12
     for (int i = 0; i < num_rays_per_component[c]; ++i)
     {
       int f = CF[ddist(prng)];          // select face with probability proportional to face area

include/igl/embree/reorient_facets_raycast.h

@@ -19,24 +19,27 @@ namespace igl
   //   F                            #F by 3 list of triangle indices
   //   rays_total                   Total number of rays that will be shot
   //   rays_minimum                 Minimum number of rays that each patch should receive
-  //   face_wise                    Decision made for each face independently, no use of patches (i.e., each face is treated as a patch)
+  //   faceg_wise                   Decision made for each face independently, no use of patches (i.e., each face is treated as a patch)
   //   use_parity                   Use parity mode
   //   is_verbose                   Verbose output to cout
   // Outputs:
   //   I                            #F list of whether face has been flipped
+  //   C                            #F list of patch ID
   template <
     typename DerivedV, 
     typename DerivedF, 
-    typename DerivedI>
+    typename DerivedI,
+    typename DerivedC>
   IGL_INLINE void reorient_facets_raycast(
     const Eigen::PlainObjectBase<DerivedV> & V,
     const Eigen::PlainObjectBase<DerivedF> & F,
     int rays_total,
     int rays_minimum,
-    bool face_wise,
+    bool facet_wise,
     bool use_parity,
     bool is_verbose,
-    Eigen::PlainObjectBase<DerivedI> & I);
+    Eigen::PlainObjectBase<DerivedI> & I,
+    Eigen::PlainObjectBase<DerivedC> & C);
 };
 
 #ifdef IGL_HEADER_ONLY

include/igl/readOFF.cpp

@@ -58,9 +58,9 @@ IGL_INLINE bool igl::readOFF(
   // Read vertices
   for(int i = 0;i<number_of_vertices;)
   {
+    fgets(line, 1000, off_file);
     double x,y,z,nx,ny,nz;
-    if((has_normals && fscanf(off_file, "%lg %lg %lg %lg %lg %lg\n",&x,&y,&z,&nx,&ny,&nz)==6) || 
-       (!has_normals && fscanf(off_file, "%lg %lg %lg\n",&x,&y,&z)==3))
+    if(sscanf(line, "%lg %lg %lg %lg %lg %lg",&x,&y,&z,&nx,&ny,&nz)>= 3)
     {
       std::vector<Scalar > vertex;
       vertex.resize(3);