Changeset 172 for trunk

Timestamp:

Nov 24, 2017, 10:11:54 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Rectangle points were not normalized.
• Fixed: Error in rect to polygon conversion.

Location:

trunk

Files:

• Packages/Common/UGeometry.pas (modified) (6 diffs)
• UMap.pas (modified) (3 diffs)

trunk/Packages/Common/UGeometry.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Math, typinfo;
+  Classes, SysUtils, Math;
 
 type
@@ -51 +51 @@
     function Center: T;
     procedure SetEmpty;
+    procedure Normalize;
     class operator Equal(const A, B: TGRect<T>): Boolean;
     constructor Create(const P1, P2: T);
@@ -201 +202 @@
   Self.Points[0] := Rect.P1;
   Self.Points[1] := T.Create(Rect.P2.X, Rect.P1.Y);
-  Self.Points[2] := Rect.P1;
+  Self.Points[2] := Rect.P2;
   Self.Points[3] := T.Create(Rect.P1.X, Rect.P2.Y);
 end;
@@ -320 +321 @@
 function TGLine<T>.ToRect: TGRect<T>;
 begin
-  Result.P1 := P1;
-  Result.P2 := P2;
+  Result := TGRect<T>.Create(P1, P2);
 end;
 
@@ -461 +461 @@
 end;
 
+procedure TGRect<T>.Normalize;
+var
+  NewP1: T;
+  NewP2: T;
+begin
+  NewP1 := P1.Min(P1, P2);
+  NewP2 := P1.Max(P1, P2);
+  P1 := NewP1;
+  P2 := NewP2;
+end;
+
 function TGRect<T>.Center: T;
 begin
@@ -481 +492 @@
   Self.P1 := P1;
   Self.P2 := P2;
+  Normalize;
 end;
 

trunk/UMap.pas

@@ -239 +239 @@
 { TVoronoiMap }
 
-function CompareDistance(C1, C2: Pointer): Integer;
-begin
-  if TCellsDistance(C1).Distance > TCellsDistance(C2).Distance then Result := 1
-  else if TCellsDistance(C1).Distance < TCellsDistance(C2).Distance then Result := -1
-  else Result := 0;
-end;
-
-function CompareDistanceReverse(const C1, C2: TCellsDistance): Integer;
-begin
-  if C1.Distance > C2.Distance then Result := -1
-  else if C1.Distance < C2.Distance then Result := 1
+function CompareDistance(const C1, C2: TCellsDistance): Integer;
+begin
+  if C1.Distance > C2.Distance then Result := 1
+  else if C1.Distance < C2.Distance then Result := -1
   else Result := 0;
 end;
@@ -321 +314 @@
     CellsDistance.Add(NewCellDist);
   end;
-  CellsDistance.Sort(CompareDistanceReverse);
+  CellsDistance.Sort(CompareDistance);
 
   // Keep shortest non-intersected cell pairs
   SelectedCells := TFPGObjectList<TCellsDistance>.Create;
   SelectedCells.FreeObjects := False;
-  I := CellsDistance.Count - 1;
-  while I >= 0 do begin
+  I := 0;
+  while I < CellsDistance.Count do begin
     Intersected := False;
     for J := 0 to SelectedCells.Count - 1 do
@@ -347 +340 @@
     end;
     if not Intersected then SelectedCells.Add(CellsDistance[I]);
-    Dec(I);
+    Inc(I);
   end;