# | 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 40 | Line 40 | |
40 | * | |
41 | * ConvexHull.hpp | |
42 | * | |
43 | < | * Purpose: To calculate convexhull, hull volume and radius |
44 | < | * using the CGAL library. |
43 | > | * Purpose: To calculate convexhull, hull volume using the QuickHull algorithm provided by QHull. |
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.2 2007-05-29 22:50:14 chuckv Exp $ |
47 | > | * @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $ |
48 | * | |
49 | */ | |
50 | ||
# | Line 53 | Line 52 | |
52 | #define MATH_CONVEXHULL_HPP_ | |
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 | – | #include <qhull/qhull.h> |
63 | – | #include <qhull/mem.h> |
64 | – | #include <qhull/qset.h> |
65 | – | #include <qhull/geom.h> |
66 | – | #include <qhull/merge.h> |
67 | – | #include <qhull/poly.h> |
68 | – | #include <qhull/io.h> |
69 | – | #include <qhull/stat.h> |
70 | – | } |
62 | ||
63 | ||
64 | + | namespace oopse { |
65 | + | class ConvexHull : public Hull { |
66 | + | public: |
67 | ||
68 | < | namespace oopse |
69 | < | { |
68 | > | ConvexHull(); |
69 | > | virtual ~ConvexHull(){}; |
70 | ||
71 | < | class ConvexHull |
78 | < | { |
71 | > | void computeHull( std::vector<StuntDouble*> bodydoubles ); |
72 | ||
73 | < | public: |
74 | < | ConvexHull(); |
82 | < | ~ConvexHull(); |
83 | < | bool genHull(std::vector<Vector3d> pos); |
84 | < | std::vector<Vector3d> getHull(); |
85 | < | RealType getVolume(); |
86 | < | RealType getRadius(); |
87 | < | RealType getInscribedRadius(); |
88 | < | void geomviewHull(const std::string& geomFileName); |
89 | < | private: |
90 | < | |
91 | < | double volume_; |
73 | > | /* Total area of Hull*/ |
74 | > | RealType getArea(){return area_;} |
75 | ||
76 | < | } |
77 | < | ; |
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 | + | RealType volume_; |
84 | + | RealType area_; |
85 | + | int dim_; |
86 | + | const std::string options_; |
87 | + | |
88 | + | private: |
89 | + | std::vector<Triangle> Triangles_; |
90 | + | }; |
91 | } | |
98 | – | |
99 | – | |
92 | #endif /*MATH_CONVEXHULL_HPP_*/ |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |