소스 검색

Merge

Former-commit-id: 2c9f6bc3502706ba4d4ca10c2ff6a30828a30c40
Daniele Panozzo 11 년 전
부모
커밋
a44dc237fc
2개의 변경된 파일6개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 2
      include/igl/ReAntTweakBar.h
  2. 4 6
      include/igl/principal_curvature.cpp

+ 2 - 2
include/igl/ReAntTweakBar.h

@@ -242,8 +242,8 @@ namespace igl
         const char * name, 
         TwType type, 
         const char * value_str);
-      const std::vector<ReTwRWItem> & get_rw_items();
-      const std::vector<ReTwCBItem> & get_cb_items();
+      IGL_INLINE const std::vector<ReTwRWItem> & get_rw_items();
+      IGL_INLINE const std::vector<ReTwCBItem> & get_cb_items();
   };
 }
 

+ 4 - 6
include/igl/principal_curvature.cpp

@@ -370,12 +370,10 @@ IGL_INLINE void CurvatureCalculator::finalEigenStuff (int i, std::vector<Eigen::
   double d = q.d();
   double e = q.e();
   
-
-  if (fabs(a) < 10e-8 || fabs(b) < 10e-8)
-  {
-    std::cout << "Degenerate quadric: " << i << std::endl;
-  }
-
+//  if (fabs(a) < 10e-8 || fabs(b) < 10e-8)
+//  {
+//    std::cout << "Degenerate quadric: " << i << std::endl;
+//  }
 
   double E = 1.0 + d*d;
   double F = d*e;