--- trunk/src/math/ConvexHull.hpp	2008/01/23 22:01:34	1222
+++ 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
@@ -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.7 2008-01-23 22:01:34 gezelter Exp $
+ *  @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $
  *
  */
 
@@ -53,44 +53,40 @@
 
 #include "math/Vector3.hpp"
 #include "config.h"
+#include "math/Hull.hpp"
+#include "math/Triangle.hpp"
 
 #include <cassert>
 #include <vector>
 #include <string>
-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>
-#endif
-}
 
 
-
 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_*/