--- trunk/src/math/ConvexHull.hpp	2007/05/29 22:50:14	1137
+++ trunk/src/math/ConvexHull.hpp	2008/01/21 21:50:29	1209
@@ -40,12 +40,11 @@
  *
  *  ConvexHull.hpp
  *
- *  Purpose: To calculate convexhull, hull volume and radius
- *  using the CGAL library.
+ *  Purpose: To calculate convexhull, hull volume using the QuickHull algorithm provided by QHull.
  *
  *  Created by Charles F. Vardeman II on 11 Dec 2006.
  *  @author  Charles F. Vardeman II
- *  @version $Id: ConvexHull.hpp,v 1.2 2007-05-29 22:50:14 chuckv Exp $
+ *  @version $Id: ConvexHull.hpp,v 1.6 2008-01-21 21:50:29 chuckv Exp $
  *
  */
 
@@ -53,48 +52,45 @@
 #define MATH_CONVEXHULL_HPP_
 
 #include "math/Vector3.hpp"
+#include "config.h"
 
 #include <cassert>
 #include <vector>
 #include <string>
 extern "C"
 {
-#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>
+#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"
+#endif
 }
 
 
 
-namespace oopse
-  {
-
-  class ConvexHull
-    {
-
-    public:
-      ConvexHull();
-      ~ConvexHull();
-      bool genHull(std::vector<Vector3d> pos);
-      std::vector<Vector3d> getHull();
-      RealType getVolume();
-      RealType getRadius();
-      RealType getInscribedRadius();
-      void geomviewHull(const std::string& geomFileName);
-    private:
-		
-		double volume_;
-
-    }
-  ;
-
-
+namespace oopse {
+  class ConvexHull {
+  public:
+    ConvexHull();
+    virtual ~ConvexHull() {}
+    bool genHull(std::vector<Vector3d> pos);
+    //std::vector<Vector3d> getHull();
+    RealType getVolume();
+    //RealType getRadius();
+    // RealType getInscribedRadius();
+    void geomviewHull(const std::string& geomFileName);
+  protected:
+    double volume_;
+    double area_;
+    int dim_;
+    const std::string options_;
+    
+  };
 }
 
-
 #endif /*MATH_CONVEXHULL_HPP_*/