Changeset 21 for trunk/UGame.pas

Timestamp:

Mar 1, 2014, 5:39:22 PM (11 years ago)

Author:

chronos

Message:

• Modified: Player View rectangle separated to CellPos and ViewSize which are values in different coordinate system.

File:

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

trunk/UGame.pas

@@ -55 +55 @@
     DefaultCellSize: TPoint;
     Cells: array of array of TCell;
-    function PosToCell(Pos: TPoint; Rect: TRect; Zoom: Double
-      ): TCell;
-    function CellToPos(Cell: TCell; Rect: TRect; Zoom: Double
-      ): TPoint;
+    function PosToCell(Pos: TPoint; Rect: TRect; Zoom: Double): TCell;
+    function CellToPos(Cell: TCell; Rect: TRect; Zoom: Double): TPoint;
     function GetHexagonPolygon(Pos: TPoint; HexSize: TPoint): TPointArray;
     procedure Paint(Canvas: TCanvas; Rect: TRect; Zoom: Double; SelectedCell: TCell);
@@ -77 +75 @@
     Game: TGame;
     Name: string;
-    View: TRect;
+    CellPos: TPoint;
+    ViewSize: TPoint;
     Color: TColor;
     ViewZoom: Double;
@@ -85 +84 @@
     TotalCells: Integer;
     StartUnits: Integer;
+    function CanvasToCellPos(Pos: TPoint): TPoint;
+    function CellToCanvasPos(Pos: TPoint): TPoint;
+    function CanvasToCellRect(Pos: TRect): TRect;
+    function CellToCanvasRect(Pos: TRect): TRect;
     procedure ComputerTurn;
     procedure SelectCell(Pos: TPoint);
@@ -222 +225 @@
 { TPlayer }
 
+function TPlayer.CanvasToCellPos(Pos: TPoint): TPoint;
+begin
+  Result := Point(Trunc(Pos.X / ViewZoom + CellPos.X),
+    Trunc(Pos.Y / ViewZoom + CellPos.Y));
+end;
+
+function TPlayer.CellToCanvasPos(Pos: TPoint): TPoint;
+begin
+  Result := Point(Trunc((Pos.X - CellPos.X) * ViewZoom),
+    Trunc((Pos.Y - CellPos.Y) * ViewZoom));
+end;
+
+function TPlayer.CanvasToCellRect(Pos: TRect): TRect;
+begin
+  Result.TopLeft := CanvasToCellPos(Pos.TopLeft);
+  Result.BottomRight := CanvasToCellPos(Pos.BottomRight);
+end;
+
+function TPlayer.CellToCanvasRect(Pos: TRect): TRect;
+begin
+  Result.TopLeft := CellToCanvasPos(Pos.TopLeft);
+  Result.BottomRight := CellToCanvasPos(Pos.BottomRight);
+end;
+
 procedure TPlayer.ComputerTurn;
 begin
@@ -230 +257 @@
 var
   NewSelectedCell: TCell;
-begin
-  NewSelectedCell := Game.Map.PosToCell(Pos, View, ViewZoom);
+  TopLeft: TPoint;
+  BottomRight: TPoint;
+begin
+  NewSelectedCell := Game.Map.PosToCell(CanvasToCellPos(Pos), CanvasToCellRect(Bounds(0, 0, ViewSize.X, ViewSize.Y)), ViewZoom);
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and IsCellsNeighbor(NewSelectedCell, SelectedCell) then begin
@@ -247 +276 @@
 procedure TPlayer.Paint(PaintBox: TPaintBox);
 begin
-  Game.Map.Paint(PaintBox.Canvas, View, ViewZoom, SelectedCell);
+  Game.Map.Paint(PaintBox.Canvas, CanvasToCellRect(Bounds(0, 0, ViewSize.X, ViewSize.Y)), ViewZoom, SelectedCell);
 end;
 
@@ -460 +489 @@
     ViewZoom := 1;
     // Center board
-    View := Bounds(-(View.Right - View.Left) div 2 + Map.GetPixelSize.X div 2,
-      -(View.Bottom - View.Top) div 2 + Map.GetPixelSize.Y div 2,
-      View.Right - View.Left,
-      View.Bottom - View.Top);
+    CellPos := Point(Trunc(Map.GetPixelSize.X div 2 - ViewSize.X div 2 / ViewZoom),
+      Trunc(Map.GetPixelSize.Y div 2 - ViewSize.Y div 2 / ViewZoom));
   end;
   CurrentPlayer := TPlayer(Players[0]);
@@ -516 +543 @@
   Points: array of TPoint;
 begin
+  // TODO: This is implemented as simple sequence lookup. It needs some faster algorithm
   Result := nil;
   CellSize := FloatPoint(DefaultCellSize.X / 1.15 * Zoom, DefaultCellSize.Y / 1.35 * Zoom);