From: Barak Itkin Date: Sun, 3 Jun 2012 19:09:46 +0000 (+0300) Subject: Add changes according to commit 4f9c0ace716b in poly2tri (C++) X-Git-Tag: p2tc-0.1.0~40 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53f3643049bffedab132e662d0a0791ed736d320;p=poly2tri-c Add changes according to commit 4f9c0ace716b in poly2tri (C++) --- diff --git a/poly2tri-c/p2t/common/utils.c b/poly2tri-c/p2t/common/utils.c index 78e1c1a..dfbdad3 100644 --- a/poly2tri-c/p2t/common/utils.c +++ b/poly2tri-c/p2t/common/utils.c @@ -66,6 +66,7 @@ p2t_orient2d (P2tPoint* pa, P2tPoint* pb, P2tPoint* pc) gboolean p2t_utils_in_scan_area (P2tPoint* pa, P2tPoint* pb, P2tPoint* pc, P2tPoint* pd) { +#if FALSE double pdx = pd->x; double pdy = pd->y; double adx = pa->x - pdx; @@ -98,4 +99,16 @@ p2t_utils_in_scan_area (P2tPoint* pa, P2tPoint* pb, P2tPoint* pc, P2tPoint* pd) } return TRUE; +#else + gdouble oadc, oadb = (pa->x - pb->x)*(pd->y - pb->y) - (pd->x - pb->x)*(pa->y - pb->y); + if (oadb >= EPSILON) { + return FALSE; + } + + oadc = (pa->x - pc->x)*(pd->y - pc->y) - (pd->x - pc->x)*(pa->y - pc->y); + if (oadc <= EPSILON) { + return FALSE; + } + return TRUE; +#endif }