Changeset 168 for trunk/UMap.pas

Timestamp:

Nov 23, 2017, 10:16:50 AM (7 years ago)

Author:

chronos

Message:

• Modified: Used TPolygon in TCell.
• Modified: Moved some generic geometry related functions to UGeometry unit.

File:

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

trunk/UMap.pas

@@ -21 +21 @@
     function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
     procedure GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
-    function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
+    function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPolygon;
   public
     procedure LoadFromFile(FileName: string); override;
@@ -33 +33 @@
   TSquareMap = class(TMap)
   private
-    function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPointArray;
+    function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPolygon;
   public
     function IsValidIndex(Index: TPoint): Boolean; override;
@@ -43 +43 @@
   TTriangleMap = class(TMap)
   private
-    function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPointArray;
+    function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPolygon;
   public
     function IsValidIndex(Index: TPoint): Boolean; override;
@@ -62 +62 @@
 { THexMap }
 
-function THexMap.GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
+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));
-  SetLength(Result, 6);
-  Result[0] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y - 0.5 * Size.Y));
-  Result[1] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
-  Result[2] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
-  Result[3] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y + 0.5 * Size.Y));
-  Result[4] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
-  Result[5] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
+  SetLength(Result.Points, 6);
+  Result.Points[0] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y - 0.5 * Size.Y));
+  Result.Points[1] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
+  Result.Points[2] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
+  Result.Points[3] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y + 0.5 * Size.Y));
+  Result.Points[4] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
+  Result.Points[5] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
 end;
 
@@ -228 +228 @@
 end;
 
-function TSquareMap.GetSquarePolygon(Pos: TPoint; Size: TPoint): TPointArray;
-begin
-  SetLength(Result, 4);
-  Result[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
-  Result[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
-  Result[2] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
-  Result[3] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
+function TSquareMap.GetSquarePolygon(Pos: TPoint; Size: TPoint): TPolygon;
+begin
+  SetLength(Result.Points, 4);
+  Result.Points[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
+  Result.Points[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
+  Result.Points[2] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
+  Result.Points[3] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
 end;
 
@@ -311 +311 @@
     NewCell.PosPx := Point(Trunc(Random * Size.X * DefaultCellSize.X),
       Trunc(Random * Size.Y * DefaultCellSize.Y));
-    SetLength(NewCell.Polygon, 1);
-    NewCell.Polygon[0] := NewCell.PosPx;
+    SetLength(NewCell.Polygon.Points, 1);
+    NewCell.Polygon.Points[0] := NewCell.PosPx;
     NewCell.Id := GetNewCellId;
     Cells[Y * Size.X + X] := NewCell;
@@ -435 +435 @@
         Polygon.CutLine(L1, Cell.PosPx);
       end;
-      Cell.Polygon := Polygon.Points;
-    end else SetLength(Cell.Polygon, 0);
+      Cell.Polygon := Polygon;
+    end else Cell.Polygon.Clear;
   end;
 
@@ -445 +445 @@
 
 function TTriangleMap.GetTrianglePolygon(Pos: TPoint; Size: TPoint;
-  Reverse: Boolean): TPointArray;
+  Reverse: Boolean): TPolygon;
 var
   Rev: Integer;
@@ -451 +451 @@
   if Reverse then Rev := -1
     else Rev := 1;
-  SetLength(Result, 3);
-  Result[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
-  Result[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
-  Result[2] := Point(Trunc(Pos.X), Trunc(Pos.Y + (Size.Y * 1.2) / 2 * Rev));
+  SetLength(Result.Points, 3);
+  Result.Points[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
+  Result.Points[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
+  Result.Points[2] := Point(Trunc(Pos.X), Trunc(Pos.Y + (Size.Y * 1.2) / 2 * Rev));
 end;