--- trunk/src/math/ConvexHull.hpp 2008/09/14 01:32:26 1293 +++ trunk/src/math/ConvexHull.hpp 2008/10/15 18:26:01 1304 @@ -44,7 +44,7 @@ * * Created by Charles F. Vardeman II on 11 Dec 2006. * @author Charles F. Vardeman II - * @version $Id: ConvexHull.hpp,v 1.10 2008-09-14 01:32:25 chuckv Exp $ + * @version $Id: ConvexHull.hpp,v 1.13 2008-10-15 18:26:01 chuckv Exp $ * */ @@ -53,7 +53,7 @@ #include "math/Vector3.hpp" #include "config.h" -#include "math/hull.hpp" +#include "math/Hull.hpp" #include "math/Triangle.hpp" #include @@ -62,14 +62,14 @@ extern "C" extern "C" { #if defined(HAVE_QHULL) -#include "qhull/qhull.h" -#include "qhull/mem.h" -#include "qhull/qset.h" -#include "qhull/geom.h" -#include "qhull/merge.h" -#include "qhull/poly.h" -#include "qhull/io.h" -#include "qhull/stat.h" +#include +#include +#include +#include +#include +#include +#include +#include #endif } #ifdef IS_MPI @@ -95,8 +95,9 @@ namespace oopse { double area_; int dim_; int Ns_; - std::vector< StuntDouble* > surfaceSDs_; + std::vector surfaceSDs_; const std::string options_; + private: std::vector Triangles_;