mirror of https://github.com/CGAL/cgal
fixed the "or" variables in Triangulation_2_traits_3.h
This commit is contained in:
parent
1429071604
commit
a09f5d39c2
|
|
@ -59,16 +59,16 @@ public:
|
|||
const Point& q,
|
||||
const Point& r)
|
||||
{
|
||||
Orientation or;
|
||||
Orientation ori;
|
||||
Point O(0.1111,0.1111,0.1111);
|
||||
Point A(1.1111,0,0);
|
||||
Point B(0,1.1111,0);
|
||||
Point C(0,0,1.1111);
|
||||
|
||||
Point P = ((or = CGAL::orientation(p,q,r,O)) != ZERO) ? O:
|
||||
((or = CGAL::orientation(p,q,r,A)) != ZERO) ? A:
|
||||
((or = CGAL::orientation(p,q,r,B)) != ZERO) ? B:
|
||||
((or = CGAL::orientation(p,q,r,C)) != ZERO) ? C: C;
|
||||
Point P = ((ori = CGAL::orientation(p,q,r,O)) != ZERO) ? O:
|
||||
((ori = CGAL::orientation(p,q,r,A)) != ZERO) ? A:
|
||||
((ori = CGAL::orientation(p,q,r,B)) != ZERO) ? B:
|
||||
((ori = CGAL::orientation(p,q,r,C)) != ZERO) ? C: C;
|
||||
return CGAL::orientation(p,q,r,P);
|
||||
}
|
||||
};
|
||||
|
|
@ -89,18 +89,18 @@ public:
|
|||
|
||||
// test belongs to the circle if and only if it belongs to a
|
||||
// sphere passing through pqr
|
||||
Orientation or;
|
||||
Orientation ori;
|
||||
Point O(0.1111,0.1111,0.1111);
|
||||
Point A(1.1111,0,0);
|
||||
Point B(0,1.1111,0);
|
||||
Point C(0,0,1.1111);
|
||||
|
||||
Point P = ((or = CGAL::orientation(p,q,r,O)) != ZERO) ? O:
|
||||
((or = CGAL::orientation(p,q,r,A)) != ZERO) ? A:
|
||||
((or = CGAL::orientation(p,q,r,B)) != ZERO) ? B:
|
||||
((or = CGAL::orientation(p,q,r,C)) != ZERO) ? C: C;
|
||||
Point P = ((ori = CGAL::orientation(p,q,r,O)) != ZERO) ? O:
|
||||
((ori = CGAL::orientation(p,q,r,A)) != ZERO) ? A:
|
||||
((ori = CGAL::orientation(p,q,r,B)) != ZERO) ? B:
|
||||
((ori = CGAL::orientation(p,q,r,C)) != ZERO) ? C: C;
|
||||
|
||||
return Oriented_side( or *
|
||||
return Oriented_side( ori *
|
||||
CGAL::side_of_oriented_sphere(p, q, r, P, s));
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue