ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/math/ConvexHull.hpp
(Generate patch)

Comparing trunk/src/math/ConvexHull.hpp (file contents):
Revision 1242 by chuckv, Wed May 14 14:31:48 2008 UTC vs.
Revision 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2006 The University of Notre Dame. All Rights Reserved.
1 > /* Copyright (c) 2008, 2009 The University of Notre Dame. All Rights Reserved.
2   *
3   * The University of Notre Dame grants you ("Licensee") a
4   * non-exclusive, royalty free, license to use, modify and
# Line 44 | Line 44
44   *
45   *  Created by Charles F. Vardeman II on 11 Dec 2006.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: ConvexHull.hpp,v 1.8 2008-05-14 14:31:48 chuckv Exp $
47 > *  @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $
48   *
49   */
50  
# Line 53 | Line 53
53  
54   #include "math/Vector3.hpp"
55   #include "config.h"
56 + #include "math/Hull.hpp"
57 + #include "math/Triangle.hpp"
58  
59   #include <cassert>
60   #include <vector>
61   #include <string>
60 extern "C"
61 {
62 #if defined(HAVE_QHULL)
63 #include "qhull/qhull.h"
64 #include "qhull/mem.h"
65 #include "qhull/qset.h"
66 #include "qhull/geom.h"
67 #include "qhull/merge.h"
68 #include "qhull/poly.h"
69 #include "qhull/io.h"
70 #include "qhull/stat.h"
71 #endif
72 }
62  
63  
75
64   namespace oopse {
65 <  class ConvexHull {
65 >  class ConvexHull : public Hull {
66    public:
67 <    ConvexHull();
68 <    virtual ~ConvexHull() {}
69 <    bool genHull(std::vector<Vector3d> pos);
70 <    //std::vector<Vector3d> getHull();
71 <    RealType getVolume();
72 <    //RealType getRadius();
73 <    // RealType getInscribedRadius();
74 <    void geomviewHull(const std::string& geomFileName);
67 >
68 >    ConvexHull();    
69 >    virtual ~ConvexHull(){};
70 >
71 >    void computeHull( std::vector<StuntDouble*> bodydoubles );
72 >
73 >    /* Total area of Hull*/
74 >    RealType getArea(){return area_;}
75 >
76 >    /* Total Volume enclosed by Hull */
77 >    RealType getVolume(){ return volume_; }
78 >
79 >    std::vector<Triangle> getMesh(){return Triangles_;}
80 >    void printHull(const std::string& geomFileName);
81 >
82    protected:
83 <    double volume_;
84 <    double area_;
83 >    RealType volume_;
84 >    RealType area_;
85      int dim_;
86      const std::string options_;
87      
88 +  private:
89 +    std::vector<Triangle> Triangles_;
90    };
91   }
95
92   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines