diff --git a/Packages/Intersections_2/include/CGAL/Straight_2.h b/Packages/Intersections_2/include/CGAL/Straight_2.h index c4bf8fd14ef..29f50e3775d 100644 --- a/Packages/Intersections_2/include/CGAL/Straight_2.h +++ b/Packages/Intersections_2/include/CGAL/Straight_2.h @@ -139,7 +139,6 @@ Straight_2_(typename K::Ray_2 const &ray) { support_ = ray.supporting_line(); typename K::Vector_2 const &dir = ray.direction().to_vector(); -// main_dir_ = (CGAL_NTS abs(dir.hx()) > CGAL_NTS abs(dir.hy()) ) ? 0 : 1; main_dir_ = (CGAL_NTS abs(dir.x()) > CGAL_NTS abs(dir.y()) ) ? 0 : 1; dir_sign_ = CGAL_NTS sign(support_.direction().to_vector().cartesian(main_dir_)); @@ -156,7 +155,6 @@ Straight_2_(typename K::Ray_2 const &ray_,bool cooriented) /* the supporting line is cooriented with the input ray iff cooriented is true */ typename K::Vector_2 const &dir = ray.direction().to_vector(); -// main_dir_ = (CGAL_NTS abs(dir.hx()) > CGAL_NTS abs(dir.hy()) ) ? 0 : 1; main_dir_ = (CGAL_NTS abs(dir.x()) > CGAL_NTS abs(dir.y()) ) ? 0 : 1; dir_sign_ = CGAL_NTS sign(support_.direction().to_vector().cartesian(main_dir_)); @@ -257,39 +255,16 @@ bool Straight_2_::operator==(const Straight_2_& s) const return false; } -/* -template -R::FT -cross(Vector_2 const &vec1, Vector_2 const &vec2) -{ - (vec1.hx() * vec2.hy() - vec1.hy() * vec2.hx()) / (vec1.hw()*vec2.hw()); -} -*/ -#if 0 // #ifdef CGAL_CARTESIAN_H -template -FT -cross(Vector_2< Cartesian > const &vec1, - Vector_2< Cartesian > const &vec2) -{ - return vec1.x() * vec2.y() - vec1.y() * vec2.x(); -} -template -int -sign_of_cross(Direction_2 const &dir1, - Direction_2 const &dir2) -{ - return CGAL_NTS sign(cross(dir1.to_vector(), dir2.to_vector())); -} -#endif + template int sign_of_cross(typename K::Direction_2 const &dir1, - typename K::Direction_2 const &dir2, - const K&) + typename K::Direction_2 const &dir2, + const K&) { int result; switch(CGALi::orientation(dir1.to_vector(), dir2.to_vector(), K())) {