--- trunk/src/math/ConvexHull.hpp	2007/05/30 18:47:04	1141
+++ trunk/src/math/ConvexHull.hpp	2009/10/20 20:05:28	1374
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 The University of Notre Dame. All Rights Reserved.
+/* Copyright (c) 2008, 2009 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
  * non-exclusive, royalty free, license to use, modify and
@@ -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.3 2007-05-30 18:47:04 chuckv Exp $
+ *  @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $
  *
  */
 
@@ -53,42 +52,41 @@
 #define MATH_CONVEXHULL_HPP_
 
 #include "math/Vector3.hpp"
+#include "config.h"
+#include "math/Hull.hpp"
+#include "math/Triangle.hpp"
 
 #include <cassert>
 #include <vector>
 #include <string>
-extern "C"
-{
-#include "QuickHull/qhull.h"
-#include "QuickHull/mem.h"
-#include "QuickHull/qset.h"
-#include "QuickHull/geom.h"
-#include "QuickHull/merge.h"
-#include "QuickHull/poly.h"
-#include "QuickHull/io.h"
-#include "QuickHull/stat.h"
-}
 
 
-
 namespace oopse {
-  class ConvexHull {
+  class ConvexHull : public Hull {
   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);
+
+    ConvexHull();    
+    virtual ~ConvexHull(){};
+
+    void computeHull( std::vector<StuntDouble*> bodydoubles );
+
+    /* Total area of Hull*/
+    RealType getArea(){return area_;}
+
+    /* Total Volume enclosed by Hull */
+    RealType getVolume(){ return volume_; } 
+
+    std::vector<Triangle> getMesh(){return Triangles_;}
+    void printHull(const std::string& geomFileName);
+
   protected:
-    double volume_;
-    double area_;
+    RealType volume_;
+    RealType area_;
     int dim_;
     const std::string options_;
     
+  private:
+    std::vector<Triangle> Triangles_;
   };
 }
-
 #endif /*MATH_CONVEXHULL_HPP_*/