3rd-party/poly2tri
1
0
Fork 0
mirror of https://github.com/jhasse/poly2tri.git synced 2024-11-30 01:03:30 +01:00
Code Issues Projects Releases Wiki Activity

Avoid triggering Werror=float-equal

Browse Source
This commit is contained in:
Clifford Yapp 2021-08-03 17:15:30 -04:00
parent 7f0487a811
commit f7ae06cfc7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
poly2tri/common/shapes.h
View File

@ -34,10 +34,14 @@
#define SHAPES_H #define SHAPES_H
#include <cmath> #include <cmath>
#include <cfloat>
#include <cstddef> #include <cstddef>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
/* Avoid Werror=float-equal warnings */
#define EQ(v1, v2) ((v1 - v2 > -DBL_MIN) && (v1 - v2 < DBL_MIN))
namespace p2t { namespace p2t {
struct Edge; struct Edge;
@ -132,11 +136,11 @@ struct Edge {
if (p1.y > p2.y) { if (p1.y > p2.y) {
q = &p1; q = &p1;
p = &p2; p = &p2;
} else if (p1.y == p2.y) { } else if (EQ(p1.y, p2.y)) {
if (p1.x > p2.x) { if (p1.x > p2.x) {
q = &p1; q = &p1;
p = &p2; p = &p2;
} else if (p1.x == p2.x) { } else if (EQ(p1.x, p2.x)) {
// Repeat points // Repeat points
throw std::runtime_error("Edge::Edge: p1 == p2"); throw std::runtime_error("Edge::Edge: p1 == p2");
} }
@ -225,7 +229,7 @@ inline bool cmp(const Point* a, const Point* b)
{ {
if (a->y < b->y) { if (a->y < b->y) {
return true; return true;
} else if (a->y == b->y) { } else if (EQ(a->y, b->y)) {
// Make sure q is point with greater x value // Make sure q is point with greater x value
if (a->x < b->x) { if (a->x < b->x) {
return true; return true;
@ -254,12 +258,12 @@ inline Point operator *(double s, const Point& a)
inline bool operator ==(const Point& a, const Point& b) inline bool operator ==(const Point& a, const Point& b)
{ {
return a.x == b.x && a.y == b.y; return EQ(a.x, b.x) && EQ(a.y, b.y);
} }
inline bool operator !=(const Point& a, const Point& b) inline bool operator !=(const Point& a, const Point& b)
{ {
return !(a.x == b.x) || !(a.y == b.y); return !(EQ(a.x, b.x)) || !(EQ(a.y, b.y));
} }
/// Peform the dot product on two vectors. /// Peform the dot product on two vectors.