From 39db15e41e9f37823735647a39c71877678d098a Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Sat, 12 Apr 2014 10:03:23 +0000
Subject: [PATCH] EgtGeomKernel 1.5d4 : - migliorie alla triangolazione di aree
 piane.

---
 EgtGeomKernel.rc | Bin 11710 -> 11710 bytes
 Triangulate.cpp  |  22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/EgtGeomKernel.rc b/EgtGeomKernel.rc
index c90eb8ae4d5426e1fd1ac9d2c3891d48248c6100..87783aeb91173af728493d45e44687dd5ca2a624 100644
GIT binary patch
delta 81
zcmdlNy)SyhH#SC-&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRqrW{@X

delta 81
zcmdlNy)SyhH#SD&&FAG5nSs<t#Zt!2ecT=(_IbJUOp})h<^h?4Qb6G@VNBt@EXaD#
GasvRpbR1Ry

diff --git a/Triangulate.cpp b/Triangulate.cpp
index 0dbb307..cc58b51 100644
--- a/Triangulate.cpp
+++ b/Triangulate.cpp
@@ -185,19 +185,27 @@ Triangulate::MakeByEC2( const PNTVECTOR& vPt, const INTVECTOR& vPol, INTVECTOR&
       if ( bIsEar) {
         // Save square distance of diagonal
          double dSqDist = SqDist(vPt[vPol[vPrev[i]]], vPt[vPol[vNext[i]]]) ;
-        // Try with next
+        // Try with next or next^2
          int j = vNext[i] ;
-         bool bIsEar1 = TestTriangle( vPt, vPol, vPrev, vNext, j) ;
          double dSqDist1 = INFINITO ;
-         if ( bIsEar1)
+         if ( TestTriangle( vPt, vPol, vPrev, vNext, j))
             dSqDist1 = SqDist( vPt[vPol[vPrev[j]]], vPt[vPol[vNext[j]]]) ;
-        // Try with prev
+         else {
+            j = vNext[j] ;
+            if ( TestTriangle( vPt, vPol, vPrev, vNext, j))
+               dSqDist1 = SqDist( vPt[vPol[vPrev[j]]], vPt[vPol[vNext[j]]]) ;
+         }
+        // Try with prev or prev^2
          int k = vPrev[i] ;
-         bool bIsEar2 = TestTriangle( vPt, vPol, vPrev, vNext, k) ;
          double dSqDist2 = INFINITO ;
-         if ( bIsEar2)
+         if ( TestTriangle( vPt, vPol, vPrev, vNext, k))
             dSqDist2 = SqDist( vPt[vPol[vPrev[k]]], vPt[vPol[vNext[k]]]) ;
-        // Choose the best
+         else {
+            k = vPrev[k] ;
+            if ( TestTriangle( vPt, vPol, vPrev, vNext, k))
+               dSqDist2 = SqDist( vPt[vPol[vPrev[k]]], vPt[vPol[vNext[k]]]) ;
+         }
+        // Choose the better
          if ( dSqDist <= dSqDist1  &&  dSqDist <= dSqDist2)
             ;  // i is the better
          else if ( dSqDist1 <= dSqDist2)