songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor getColDetect()

This commit is contained in:
Sebastian Morr 2014-07-19 17:03:52 +02:00
parent ef485e4475
commit a986f9e749
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/Minkowski_sum_conv_lien_2.h
View File

@ -194,9 +194,8 @@ public:
CGAL_precondition(pgn1.orientation() == CGAL::COUNTERCLOCKWISE);
CGAL_precondition(pgn2.orientation() == CGAL::COUNTERCLOCKWISE);
Polygon_2 revP1 = transform(Aff_transformation_2<Kernel>(SCALING, -1), pgn1);
Polygon_2 p2 = pgn2;
_aabb_collision_detector = new AABBCollisionDetector<Kernel_, Container_>(p2, revP1);
const Polygon_2 inversed_p1 = transform(Aff_transformation_2<Kernel>(SCALING, -1), pgn1);
_aabb_collision_detector = new AABBCollisionDetector<Kernel_, Container_>(pgn2, inversed_p1);
// compute the reduced convolution
Segments_list reduced_conv;
@ -216,11 +215,11 @@ public:
markOutsideLoop(arr, sum_bound);
// turn pgn1 by 180 degrees
Polygon_2 reverse_pgn1 = transform(Aff_transformation_2<Kernel>(ROTATION, 0, -1), pgn1);
Polygon_2 rotated_pgn1 = transform(Aff_transformation_2<Kernel>(ROTATION, 0, -1), pgn1);
// trace holes
for (Face_iterator itr = arr.faces_begin(); itr != arr.faces_end(); ++itr) {
handleFace(arr, itr, reverse_pgn1, pgn2, sum_holes);
handleFace(arr, itr, rotated_pgn1, pgn2, sum_holes);
}
std::list<Halfedge_handle> removeList;
@ -402,19 +401,14 @@ public:
private:
AABBCollisionDetector<Kernel, Container_> *_aabb_collision_detector;
AABBCollisionDetector<Kernel, Container_> *getColDetect() const {
return _aabb_collision_detector;
}
/*
This version assumes poly1 is reflected through origin. (as called from nested loops filter)
*/
bool checkCollisionDetection(Arrangement_history_2 &arr, Halfedge_handle &handle, const Polygon_2 &pgn1, const Polygon_2 &pgn2) const {
AABBCollisionDetector<Kernel, Container_> *collision_detector = getColDetect();
Point_2 mid_point = findInsidePoint(arr, handle);
Polygon_2 t_pgn1 = transform(typename Kernel::Aff_transformation_2(CGAL::Translation(), Vector_2(CGAL::ORIGIN, mid_point)), pgn1);
collision_detector->setTranslationPoint(mid_point);
return collision_detector->checkCollision(t_pgn1, pgn2);
_aabb_collision_detector->setTranslationPoint(mid_point);
return _aabb_collision_detector->checkCollision(t_pgn1, pgn2);
}
Point_2 findInsidePoint(Arrangement_history_2 &arr, Halfedge_handle &handle) const {
@ -521,12 +515,11 @@ private:
This version reflects poly 1.
*/
bool checkCollisionDetection(Arrangement_history_2 &arr, Point_2 &point, const Polygon_2 &pgn1, const Polygon_2 &pgn2) const {
AABBCollisionDetector<Kernel, Container_> *collision_detector = getColDetect();
Point_2 p = point;
Polygon_2 r_pgn1 = transform(Aff_transformation_2<Kernel>(SCALING, -1), pgn1);
Polygon_2 t_pgn1 = transform(typename Kernel::Aff_transformation_2(CGAL::Translation(), Vector_2(CGAL::ORIGIN, p)), r_pgn1);
collision_detector->setTranslationPoint(p);
return collision_detector->checkCollision(t_pgn1, pgn2);
_aabb_collision_detector->setTranslationPoint(p);
return _aabb_collision_detector->checkCollision(t_pgn1, pgn2);
}
bool checkSegmentCollisionDetection(Arrangement_history_2 &arr, Segment_2 &seg, const Polygon_2 &pgn1, const Polygon_2 &pgn2) const {

6
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/new/aabb/AABB_Collision_detector.h
View File

@ -28,7 +28,7 @@ protected:
public:
AABBCollisionDetector(Polygon_2 &p, Polygon_2 &q)
AABBCollisionDetector(const Polygon_2 &p, const Polygon_2 &q)
: m_stationary_tree((p.edges_begin()), (p.edges_end())), m_translating_tree((q.edges_begin()), (q.edges_end())), m_p(q), m_q(p) {
}
bool checkCollision(const Polygon_2 &p, const Polygon_2 &q) {
@ -48,8 +48,8 @@ private:
AABB_Tree m_stationary_tree;
AABB_Tree m_translating_tree;
Point m_translation_point;
Polygon_2 &m_p;
Polygon_2 &m_q;
const Polygon_2 &m_p;
const Polygon_2 &m_q;
};
} // namespace internal