Browse Source

belongs in copyleft not cgal

Former-commit-id: 06b1542846c26b7bf75280762c4128b5f2118f45
Alec Jacobson 9 years ago
parent
commit
71bc40c4d8
2 changed files with 6 additions and 15 deletions
  1. 3 12
      include/igl/copyleft/swept_volume.cpp
  2. 3 3
      include/igl/copyleft/swept_volume.h

+ 3 - 12
include/igl/copyleft/cgal/swept_volume.cpp → include/igl/copyleft/swept_volume.cpp

@@ -1,9 +1,7 @@
 #include "swept_volume.h"
-//#include "tictoc.h"
-#include "../../swept_volume_bounding_box.h"
-#include "../../swept_volume_signed_distance.h"
-#include "../../voxel_grid.h"
-#include "../../get_seconds.h"
+#include "../swept_volume_bounding_box.h"
+#include "../swept_volume_signed_distance.h"
+#include "../voxel_grid.h"
 #include "../marching_cubes.h"
 #include <iostream>
 
@@ -39,20 +37,13 @@ IGL_INLINE void igl::copyleft::cgal::swept_volume(
   const double isolevel = isolevel_grid*h;
 
   // create grid
-  //cerr<<"Creating grid "<<s<<" ..."<<endl;
-  //tictoc();
   RowVector3i res;
   MatrixXd GV;
   voxel_grid(Mbox,s,pad,GV,res);
-  //cerr<<tictoc()<<" seconds."<<endl;
 
   // compute values
   VectorXd S;
-  //cerr<<"Signed Distance..."<<endl;
   swept_volume_signed_distance(V,F,transform,steps,GV,res,h,isolevel,S);
-  //cerr<<tictoc()<<" seconds."<<endl;
-  //cerr<<"Marching cubes..."<<endl;
   S.array()-=isolevel;
   marching_cubes(S,GV,res(0),res(1),res(2),SV,SF);
-  //cerr<<tictoc()<<" seconds."<<endl;
 }

+ 3 - 3
include/igl/copyleft/cgal/swept_volume.h → include/igl/copyleft/swept_volume.h

@@ -1,6 +1,6 @@
-#ifndef IGL_COPYLEFT_CGAL_SWEPT_VOLUME_H
-#define IGL_COPYLEFT_CGAL_SWEPT_VOLUME_H
-#include "../../igl_inline.h"
+#ifndef IGL_COPYLEFT_SWEPT_VOLUME_H
+#define IGL_COPYLEFT_SWEPT_VOLUME_H
+#include "../igl_inline.h"
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 namespace igl