Changeset 170 for trunk/UGame.pas

Timestamp:

Nov 23, 2017, 5:02:49 PM (7 years ago)

Author:

chronos

Message:

• Modified: UGeometry unit rewritten to use generics and define own TPoint and TRect types.

File:

• trunk/UGame.pas (modified) (28 diffs)

trunk/UGame.pas

@@ -161 +161 @@
   TCanvasEx = class(TCanvas)
     class procedure TextOutEx(Canvas: TCanvas; X,Y: Integer; const Text: string; MovePen: Boolean = True);
-    class procedure PolygonEx(Canvas: TCanvas; const Points: array of TPoint; Winding: Boolean);
+    class procedure PolygonEx(Canvas: TCanvas; const Points: array of Classes.TPoint; Winding: Boolean);
   end;
 
@@ -957 +957 @@
     with CellLink do begin
       if Length(Points) >= 2 then begin
-        MoveTo(View.CellToCanvasPos(Points[0]));
+        MoveTo(PointToStdPoint(View.CellToCanvasPos(Points[0])));
         for I := 1 to Length(Points) - 1 do
-          LineTo(View.CellToCanvasPos(Points[I]));
+          LineTo(PointToStdPoint(View.CellToCanvasPos(Points[I])));
       end;
     end;
@@ -999 +999 @@
       for NeighCell in Cell.MapCell.Neighbors do begin
         Pen.Color := clYellow;
-        MoveTo(View.CellToCanvasPos(Cell.MapCell.PosPx));
-        LineTo(View.CellToCanvasPos(NeighCell.PosPx));
+        MoveTo(PointToStdPoint(View.CellToCanvasPos(Cell.MapCell.PosPx)));
+        LineTo(PointToStdPoint(View.CellToCanvasPos(NeighCell.PosPx)));
       end;
 
@@ -1022 +1022 @@
       Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
       if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-      ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+      ArrowCenter := View.CellToCanvasPos(TPoint.Create(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
         Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
       Player.Game.Map.DrawArrow(Canvas, View, ArrowCenter,
@@ -1051 +1051 @@
 end;
 
-class procedure TCanvasEx.PolygonEx(Canvas: TCanvas; const Points: array of TPoint; Winding: Boolean);
+class procedure TCanvasEx.PolygonEx(Canvas: TCanvas; const Points: array of Classes.TPoint; Winding: Boolean);
 begin
   //Changing;
@@ -1349 +1349 @@
   for Cell in Cells do begin
     for NeighborCell in Cell.Neighbors do
-      NeighborCell.Angle := ArcTan2Point(Point(
-        NeighborCell.PosPx.X - Cell.PosPx.X,
-        NeighborCell.PosPx.Y - Cell.PosPx.Y));
+      NeighborCell.Angle := TLine.Create(Cell.PosPx, NeighborCell.PosPx).GetAngle;
 
     Cell.Neighbors.Sort(CompareCellAngle);
@@ -1375 +1373 @@
       Rect := PixelRect;
       with Image.Picture.Bitmap do begin
-        Pos := Point(Trunc(Coord.X / (Rect.Right - Rect.Left) * Width),
-          Trunc(Coord.Y / (Rect.Bottom - Rect.Top) * Height));
+        Pos := TPoint.Create(Trunc(Coord.X / Rect.Size.X * Width),
+          Trunc(Coord.Y / Rect.Size.Y * Height));
         Color := Canvas.Pixels[Pos.X, Pos.Y];
       end;
@@ -1383 +1381 @@
     msRounded: begin
       Rect := PixelRect;
-      Center := Point(Rect.Left + (Rect.Right - Rect.Left) div 2,
-        Rect.Top + (Rect.Bottom - Rect.Top) div 2);
-      Result := Sqr(Coord.X - Center.X) / Sqr((Rect.Right - Rect.Left) div 2) +
-        Sqr(Coord.Y - Center.Y) / Sqr((Rect.Bottom - Rect.Top) div 2) > 1;
+      Center := Rect.Center;
+      Result := Sqr(Coord.X - Center.X) / Sqr(Rect.Size.X div 2) +
+        Sqr(Coord.Y - Center.Y) / Sqr(Rect.Size.Y div 2) > 1;
     end
     else Result := False;
@@ -1395 +1392 @@
   Angle: Double; Text: string);
 var
-  Points: array of TPoint;
+  Points: array of Classes.TPoint;
   FPoints: array of TFloatPoint;
   I: Integer;
@@ -1404 +1401 @@
   SetLength(Points, 8);
   SetLength(FPoints, 8);
-  ArrowSize := Point(Trunc(DefaultCellSize.X / 3 * View.Zoom),
+  ArrowSize := TPoint.Create(Trunc(DefaultCellSize.X / 3 * View.Zoom),
     Trunc(DefaultCellSize.Y / 3 * View.Zoom));
   FPoints[0] := FloatPoint(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
@@ -1480 +1477 @@
   Node2: TDOMNode;
 begin
-  Size := Point(ReadInteger(Node, 'SizeX', 0), ReadInteger(Node, 'SizeY', 0));
+  Size := TPoint.Create(ReadInteger(Node, 'SizeX', 0), ReadInteger(Node, 'SizeY', 0));
   DefaultCellSize.X := ReadInteger(Node, 'DefaultCellSizeX', 1);
   DefaultCellSize.Y := ReadInteger(Node, 'DefaultCellSizeY', 1);
@@ -1565 +1562 @@
   I: Integer;
   TextPos: TPoint;
-  Points: array of TPoint;
+  Points: array of Classes.TPoint;
   TextSize: TSize;
 begin
@@ -1590 +1587 @@
     SetLength(Points, Length(Cell.Polygon.Points));
     for I := 0 to Length(Points) - 1 do
-      Points[I] := View.CellToCanvasPos(Cell.Polygon.Points[I]);
+      Points[I] := PointToStdPoint(View.CellToCanvasPos(Cell.Polygon.Points[I]));
     Brush.Style := bsSolid;
     //Polygon(Points, False, 0, Length(Points));
@@ -1640 +1637 @@
     NewCell := TCell.Create;
     NewCell.Map := Self;
-    NewCell.PosPx := Point(X * DefaultCellSize.X, Y * DefaultCellSize.Y);
+    NewCell.PosPx := TPoint.Create(X * DefaultCellSize.X, Y * DefaultCellSize.Y);
     NewCell.Id := GetNewCellId;
     SetLength(NewCell.Polygon.Points, 1);
@@ -1731 +1728 @@
 begin
   MaxPower := 99;
-  DefaultCellSize := Point(220, 220);
+  DefaultCellSize := TPoint.Create(220, 220);
   Cells := TCells.Create;
   Cells.Map := Self;
-  Size := Point(0, 0);
+  Size := TPoint.Create(0, 0);
   Image := TImage.Create(nil);
   CellLinks := TCellLinks.Create;
@@ -1743 +1740 @@
 destructor TMap.Destroy;
 begin
-  Size := Point(0, 0);
+  Size := TPoint.Create(0, 0);
   FreeAndNil(Areas);
   FreeAndNil(CellLinks);
@@ -1756 +1753 @@
   CellRect: TRect;
 begin
-  Result := Rect(0, 0, 0, 0);
+  Result := TRect.Create(TPoint.Create(0, 0), TPoint.Create(0, 0));
   // This is generic algorithm to determine pixel size of entire map
   for I := 0 to Cells.Count - 1 do begin
@@ -1762 +1759 @@
     if I = 0 then Result := CellRect
       else begin
-        if CellRect.Right > Result.Right then Result.Right := CellRect.Right;
-        if CellRect.Bottom > Result.Bottom then Result.Bottom := CellRect.Bottom;
-        if CellRect.Left < Result.Left then Result.Left := CellRect.Left;
-        if CellRect.Top < Result.Top then  Result.Top := CellRect.Top;
+        Result.P1 := TPoint.Min(Result.P1, CellRect.P1);
+        Result.P2 := TPoint.Max(Result.P2, CellRect.P2);
       end;
   end;
@@ -1840 +1835 @@
     raise Exception.Create(SZeroZoomNotAlowed);
   FZoom := AValue;
-  SourceRect := Bounds(Trunc(SourceRect.Left + (SourceRect.Right - SourceRect.Left) div 2 - (DestRect.Right - DestRect.Left) / Zoom / 2),
-    Trunc(SourceRect.Top +  (SourceRect.Bottom - SourceRect.Top) div 2 - (DestRect.Bottom - DestRect.Top) / Zoom / 2),
-    Trunc((DestRect.Right - DestRect.Left) / Zoom),
-    Trunc((DestRect.Bottom - DestRect.Top) / Zoom));
+  SourceRect := TRect.CreateBounds(TPoint.Create(Trunc(SourceRect.P1.X + SourceRect.Size.X div 2 - DestRect.Size.X / Zoom / 2),
+    Trunc(SourceRect.P1.Y +  SourceRect.Size.Y div 2 - DestRect.Size.Y / Zoom / 2)),
+    TPoint.Create(Trunc(DestRect.Size.X / Zoom),
+    Trunc(DestRect.Size.Y / Zoom)));
 end;
 
@@ -1856 +1851 @@
   Diff: TPoint;
 begin
-  if RectEquals(FDestRect, AValue) then Exit;
-  Diff := Point(Trunc((DestRect.Right - DestRect.Left) / Zoom - (AValue.Right - AValue.Left) / Zoom) div 2,
-    Trunc((DestRect.Bottom - DestRect.Top) / Zoom - (AValue.Bottom - AValue.Top) / Zoom) div 2);
+  if FDestRect = AValue then Exit;
+  Diff := TPoint.Create(Trunc(DestRect.Size.X / Zoom - AValue.Size.X / Zoom) div 2,
+    Trunc(DestRect.Size.Y / Zoom - AValue.Size.Y / Zoom) div 2);
   FDestRect := AValue;
-  SourceRect := Bounds(SourceRect.Left + Diff.X, SourceRect.Top + Diff.Y,
-    Trunc((DestRect.Right - DestRect.Left) / Zoom),
-    Trunc((DestRect.Bottom - DestRect.Top) / Zoom));
+  SourceRect := TRect.CreateBounds(TPoint.Create(SourceRect.P1.X + Diff.X, SourceRect.P1.Y + Diff.Y),
+    TPoint.Create(Trunc(DestRect.Size.X / Zoom),
+    Trunc(DestRect.Size.Y / Zoom)));
 end;
 
@@ -1984 +1979 @@
     Node2 := Node3.FirstChild;
     while Assigned(Node2) and (Node2.NodeName = 'Point') do begin
-      Polygon.AddPoint(Point(ReadInteger(Node2, 'X', 0), ReadInteger(Node2, 'Y', 0)));
+      Polygon.AddPoint(TPoint.Create(ReadInteger(Node2, 'X', 0), ReadInteger(Node2, 'Y', 0)));
       Node2 := Node2.NextSibling;
     end;
@@ -2034 +2029 @@
 function TCell.IsVisible(View: TView): Boolean;
 var
-  RectA, RectB: TRect;
-begin
-  RectA := Polygon.GetRect;
-  RectB := View.SourceRect;
-  Result := ((RectA.Left < RectB.Right) and (RectA.Right > RectB.Left) and
-    (RectA.Top < RectB.Bottom) and (RectA.Bottom > RectB.Top));
+  RectPolygon, RectView: TRect;
+begin
+  RectPolygon := Polygon.GetRect;
+  RectView := View.SourceRect;
+  Result := (
+    (RectPolygon.P1.X < RectView.P2.X) and
+    (RectPolygon.P2.X > RectView.P1.X) and
+    (RectPolygon.P1.Y < RectView.P2.Y) and
+    (RectPolygon.P2.Y > RectView.P1.Y)
+  );
 end;
 
@@ -2108 +2107 @@
 function TView.CanvasToCellPos(Pos: TPoint): TPoint;
 begin
-  Result := Point(Trunc(Pos.X / Zoom + SourceRect.Left),
-    Trunc(Pos.Y / Zoom + SourceRect.Top));
+  Result := TPoint.Create(Trunc(Pos.X / Zoom + SourceRect.P1.X),
+    Trunc(Pos.Y / Zoom + SourceRect.P1.Y));
 end;
 
 function TView.CellToCanvasPos(Pos: TPoint): TPoint;
 begin
-  Result := Point(Trunc((Pos.X - SourceRect.Left) * Zoom),
-    Trunc((Pos.Y - SourceRect.Top) * Zoom));
+  Result := TPoint.Create(Trunc((Pos.X - SourceRect.P1.X) * Zoom),
+    Trunc((Pos.Y - SourceRect.P1.Y) * Zoom));
 end;
 
 function TView.CanvasToCellRect(Pos: TRect): TRect;
 begin
-  Result.TopLeft := CanvasToCellPos(Pos.TopLeft);
-  Result.BottomRight := CanvasToCellPos(Pos.BottomRight);
+  Result.P1 := CanvasToCellPos(Pos.P1);
+  Result.P2 := CanvasToCellPos(Pos.P2);
 end;
 
 function TView.CellToCanvasRect(Pos: TRect): TRect;
 begin
-  Result.TopLeft := CellToCanvasPos(Pos.TopLeft);
-  Result.BottomRight := CellToCanvasPos(Pos.BottomRight);
+  Result.P1 := CellToCanvasPos(Pos.P1);
+  Result.P2 := CellToCanvasPos(Pos.P2);
 end;
 
@@ -2578 +2577 @@
 begin
   MapRect := Game.Map.PixelRect;
-  SourceRect := Bounds(MapRect.Left + (MapRect.Right - MapRect.Left) div 2 - (SourceRect.Right - SourceRect.Left) div 2,
-    MapRect.Top + (MapRect.Bottom - MapRect.Top) div 2 - (SourceRect.Bottom - SourceRect.Top) div 2,
-    SourceRect.Right - SourceRect.Left,
-    SourceRect.Bottom - SourceRect.Top);
+  SourceRect := TRect.CreateBounds(TPoint.Create(MapRect.P1.X + MapRect.Size.X div 2 - SourceRect.Size.X div 2,
+    MapRect.P1.Y + MapRect.Size.Y div 2 - SourceRect.Size.Y div 2),
+    TPoint.Create(SourceRect.Size.X,
+    SourceRect.Size.Y));
 end;
 
 procedure TView.CenterPlayerCity(Player: TPlayer);
 begin
-  SourceRect := Bounds(Player.StartCell.PosPx.X - (SourceRect.Right - SourceRect.Left) div 2,
-    Player.StartCell.PosPx.Y - (SourceRect.Bottom - SourceRect.Top) div 2,
-    SourceRect.Right - SourceRect.Left,
-    SourceRect.Bottom - SourceRect.Top);
+  SourceRect := TRect.CreateBounds(TPoint.Create(Player.StartCell.PosPx.X - SourceRect.Size.X div 2,
+    Player.StartCell.PosPx.Y - SourceRect.Size.Y div 2),
+    TPoint.Create(SourceRect.Size.X,
+    SourceRect.Size.Y));
 end;
 
@@ -3247 +3246 @@
   with Config do begin
     MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
-    Map.Size := Point(GetValue(DOMString(Path + '/MapSizeX'), 10),
+    Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), 10),
       GetValue(DOMString(Path + '/MapSizeY'), 10));
     MapImageFileName := string(GetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName)));
@@ -3508 +3507 @@
 
   Map.Game := Self;
-  Map.Size := Point(3, 3);
+  Map.Size := TPoint.Create(3, 3);
 end;
 
@@ -3601 +3600 @@
     with CellLink do begin
       if Length(Points) >= 2 then begin
-        MoveTo(View.CellToCanvasPos(Points[0]));
+        MoveTo(PointToStdPoint(View.CellToCanvasPos(Points[0])));
         for I := 1 to Length(Points) - 1 do
-          LineTo(View.CellToCanvasPos(Points[I]));
+          LineTo(PointToStdPoint(View.CellToCanvasPos(Points[I])));
       end;
     end;
@@ -3630 +3629 @@
       Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
       if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-      ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+      ArrowCenter := View.CellToCanvasPos(TPoint.Create(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
         Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
       DrawArrow(Canvas, View, ArrowCenter,