Browse Source

Merge pull request #249 from sideeffects/master

Build fix for Microsoft Visual C++

Former-commit-id: 6ea84811ad1c38b359c21a032b10ce62908035db
Daniele Panozzo 9 years ago
parent
commit
670b9d2241
2 changed files with 5 additions and 5 deletions
  1. 1 1
      include/igl/active_set.cpp
  2. 4 4
      tutorial/706_FacetOrientation/main.cpp

+ 1 - 1
include/igl/active_set.cpp

@@ -45,7 +45,7 @@ IGL_INLINE igl::SolverStatus igl::active_set(
   )
 {
 //#define ACTIVE_SET_CPP_DEBUG
-#ifdef ACTIVE_SET_CPP_DEBUG
+#if defined(ACTIVE_SET_CPP_DEBUG) && !defined(_MSC_VER)
 #  warning "ACTIVE_SET_CPP_DEBUG"
 #endif
   using namespace Eigen;

+ 4 - 4
tutorial/706_FacetOrientation/main.cpp

@@ -14,7 +14,7 @@
 igl::viewer::Viewer viewer;
 Eigen::MatrixXd V;
 std::vector<Eigen::VectorXi> C(2);
-std::vector<Eigen::MatrixXd> RGB(2);
+std::vector<Eigen::MatrixXd> RGBcolors(2);
 Eigen::MatrixXi F;
 std::vector<Eigen::MatrixXi> FF(2);
 bool is_showing_reoriented = false;
@@ -43,9 +43,9 @@ S,s      Scramble colors
       HSV.col(0) = 
         360.*C[pass].array().cast<double>()/(double)C[pass].maxCoeff();
       HSV.rightCols(2).setConstant(1.0);
-      igl::hsv_to_rgb(HSV,RGB[pass]);
+      igl::hsv_to_rgb(HSV,RGBcolors[pass]);
     }
-    viewer.data.set_colors(RGB[facetwise]);
+    viewer.data.set_colors(RGBcolors[facetwise]);
   };
 
   viewer.callback_key_pressed = 
@@ -76,7 +76,7 @@ S,s      Scramble colors
     }
     viewer.data.clear();
     viewer.data.set_mesh(V,is_showing_reoriented?FF[facetwise]:F);
-    viewer.data.set_colors(RGB[facetwise]);
+    viewer.data.set_colors(RGBcolors[facetwise]);
     return true;
   };