Changeset 171 for trunk/UMap.pas

Timestamp:

Nov 23, 2017, 7:05:37 PM (7 years ago)

Author:

chronos

Message:

• Modified: Use specialized TPointF type from generic class.
• Modified: Part of fixes for Voronoi map generation.

File:

• trunk/UMap.pas (modified) (6 diffs)

trunk/UMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, XMLRead, XMLWrite, DOM, Contnrs, UGeometryClasses,
-  UGeometry;
+  Classes, SysUtils, UGame, XMLRead, XMLWrite, DOM, UGeometryClasses,
+  UGeometry, fgl;
 
 type
@@ -64 +64 @@
 function THexMap.GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPolygon;
 var
-  Shift: TFloatPoint;
-begin
-  Shift := FloatPoint(0.5 * cos(30 / 180 * Pi), 0.5 * sin(30 / 180 * Pi));
+  Shift: TPointF;
+begin
+  Shift := TPointF.Create(0.5 * cos(30 / 180 * Pi), 0.5 * sin(30 / 180 * Pi));
   SetLength(Result.Points, 6);
   Result.Points[0] := TPoint.Create(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y - 0.5 * Size.Y));
@@ -246 +246 @@
 end;
 
-function CompareDistanceReverse(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
+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
   else Result := 0;
 end;
@@ -258 +258 @@
   I1, I2: Integer;
   NewCell: TCell;
-  CellsDistance: TObjectList; // TObjectList<TCellsDistance>
+  CellsDistance: TFPGObjectList<TCellsDistance>;
   NewCellDist: TCellsDistance;
-  SelectedCells: TObjectList; // TObjectList<TCellsDistance>
+  SelectedCells: TFPGObjectList<TCellsDistance>;
   I, J: Integer;
   Intersected: Boolean;
@@ -312 +312 @@
 
   // Calculate distance between all cells
-  CellsDistance := TObjectList.Create;
+  CellsDistance := TFPGObjectList<TCellsDistance>.Create;
   for I1 := 1 to Cells.Count - 1 do
   for I2 := I1 + 1 to Cells.Count - 1 do begin
@@ -324 +324 @@
 
   // Keep shortest non-intersected cell pairs
-  SelectedCells := TObjectList.Create;
-  SelectedCells.OwnsObjects := False;
+  SelectedCells := TFPGObjectList<TCellsDistance>.Create;
+  SelectedCells.FreeObjects := False;
   I := CellsDistance.Count - 1;
   while I >= 0 do begin