@@ -1271,8 +1271,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1271
1271
p3 = mHalfEdge [mHalfEdge [actedge]->getNext ()]->getPoint ();
1272
1272
p4 = mHalfEdge [mHalfEdge [mHalfEdge [actedge]->getNext ()]->getDual ()]->getPoint ();
1273
1273
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1274
- double dista = sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1275
- double distb = sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1274
+ double dista = std:: sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1275
+ double distb = std:: sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1276
1276
if ( dista <= distb )
1277
1277
{
1278
1278
insertForcedSegment ( p1, p3, breakline );
@@ -1293,8 +1293,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1293
1293
p3 = mHalfEdge [mHalfEdge [actedge]->getNext ()]->getPoint ();
1294
1294
p4 = mHalfEdge [mHalfEdge [mHalfEdge [actedge]->getNext ()]->getDual ()]->getPoint ();
1295
1295
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1296
- double distpart = sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1297
- double disttot = sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1296
+ double distpart = std:: sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1297
+ double disttot = std:: sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1298
1298
float frac = distpart / disttot;
1299
1299
1300
1300
if ( frac == 0 || frac == 1 )// just in case MathUtils::lineIntersection does not work as expected
@@ -1359,8 +1359,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1359
1359
p3 = mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getPoint ();
1360
1360
p4 = mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getPoint ();
1361
1361
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1362
- double dista = sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1363
- double distb = sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1362
+ double dista = std:: sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1363
+ double distb = std:: sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1364
1364
if ( dista <= distb )
1365
1365
{
1366
1366
insertForcedSegment ( p1, p3, breakline );
@@ -1381,8 +1381,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1381
1381
p3 = mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getPoint ();
1382
1382
p4 = mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getPoint ();
1383
1383
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1384
- double distpart = sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1385
- double disttot = sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1384
+ double distpart = std:: sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1385
+ double disttot = std:: sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1386
1386
float frac = distpart / disttot;
1387
1387
if ( frac == 0 || frac == 1 )
1388
1388
{
@@ -1406,8 +1406,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1406
1406
p3 = mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getPoint ();
1407
1407
p4 = mHalfEdge [mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getNext ()]->getPoint ();
1408
1408
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1409
- double dista = sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1410
- double distb = sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1409
+ double dista = std:: sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1410
+ double distb = std:: sqrt ( ( crosspoint.x () - mPointVector [p4]->x () ) * ( crosspoint.x () - mPointVector [p4]->x () ) + ( crosspoint.y () - mPointVector [p4]->y () ) * ( crosspoint.y () - mPointVector [p4]->y () ) );
1411
1411
if ( dista <= distb )
1412
1412
{
1413
1413
insertForcedSegment ( p1, p3, breakline );
@@ -1428,8 +1428,8 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
1428
1428
p3 = mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getPoint ();
1429
1429
p4 = mHalfEdge [mHalfEdge [mHalfEdge [mHalfEdge [crossedEdges.last ()]->getDual ()]->getNext ()]->getNext ()]->getPoint ();
1430
1430
MathUtils::lineIntersection ( mPointVector [p1], mPointVector [p2], mPointVector [p3], mPointVector [p4], &crosspoint );
1431
- double distpart = sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1432
- double disttot = sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1431
+ double distpart = std:: sqrt ( ( crosspoint.x () - mPointVector [p3]->x () ) * ( crosspoint.x () - mPointVector [p3]->x () ) + ( crosspoint.y () - mPointVector [p3]->y () ) * ( crosspoint.y () - mPointVector [p3]->y () ) );
1432
+ double disttot = std:: sqrt ( ( mPointVector [p3]->x () - mPointVector [p4]->x () ) * ( mPointVector [p3]->x () - mPointVector [p4]->x () ) + ( mPointVector [p3]->y () - mPointVector [p4]->y () ) * ( mPointVector [p3]->y () - mPointVector [p4]->y () ) );
1433
1433
float frac = distpart / disttot;
1434
1434
if ( frac == 0 || frac == 1 )
1435
1435
{
0 commit comments