Changeset 21

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.

Location:

trunk

Files:

• Languages/xtactics.po (modified) (1 diff)
• UFormMain.pas (modified) (8 diffs)
• UGame.pas (modified) (8 diffs)

trunk/Languages/xtactics.po

@@ -34 +34 @@
 msgstr ""
 
+#: uformmain.splayerwins
+msgid "Player %s wins"
+msgstr ""
+

trunk/UFormMain.pas

@@ -76 +76 @@
   UFormNew, UFormMove;
 
+resourcestring
+  SPlayerWins = 'Player %s wins';
+
 {$R *.lfm}
 
@@ -84 +87 @@
   if Game.Running then
   with Game.CurrentPlayer do begin
-    View := Bounds(View.Left, View.Top, PaintBox1.Width,
-      PaintBox1.Height);
+    ViewSize := Point(PaintBox1.Width, PaintBox1.Height);
     Paint(PaintBox1);
   end;
@@ -98 +100 @@
   if Assigned(Game.CurrentPlayer) then
   with Game.CurrentPlayer do
-    View := Bounds(View.Left + (View.Right - View.Left) div 2 - PaintBox1.Width div 2,
-      View.Top + (View.Bottom - View.Top) div 2 - PaintBox1.Height div 2,
-      PaintBox1.Width, PaintBox1.Height);
+    ViewSize := Point(PaintBox1.Width, PaintBox1.Height);
   Redraw;
 end;
 
 procedure TFormMain.Timer1Timer(Sender: TObject);
+var
+  NewCaption: string;
 begin
   if RedrawPending then begin
     RedrawPending := False;
     PaintBox1.Repaint;
-    Caption := Game.CurrentPlayer.Name + ' - turn ' + IntToStr(Game.TurnCounter) + ' - xTactics';
+
+    NewCaption := 'xTactics';
+    if Assigned(Game.CurrentPlayer) then
+      NewCaption := Game.CurrentPlayer.Name + ' - turn ' + IntToStr(Game.TurnCounter) + ' - ' + NewCaption;
+    Caption := NewCaption;
   end;
 end;
@@ -128 +134 @@
 procedure TFormMain.DoOnWin(Player: TPlayer);
 begin
-  ShowMessage('Player ' + Player.Name + ' wins');
+  ShowMessage(Format(SPlayerWins, [Player.Name]));
 end;
 
@@ -188 +194 @@
 
 procedure TFormMain.FormShow(Sender: TObject);
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Game.Players.Count - 1 do
+    TPlayer(Game.Players[I]).ViewSize := Point(PaintBox1.Canvas.Width, PaintBox1.Canvas.Height);
   Game.New;
+  Game.Running := True;
   Redraw;
 end;
@@ -199 +210 @@
     if Game.CurrentPlayer.Mode = pmHuman then begin
       StartMousePoint := Point(X, Y);
-      StartViewPoint := Point(Game.CurrentPlayer.View.Left, Game.CurrentPlayer.View.Top);
+      StartViewPoint := Game.CurrentPlayer.CellPos;
       MoveActive := True;
     end;
@@ -215 +226 @@
   if MoveActive then begin
     if Game.CurrentPlayer.Mode = pmHuman then begin
-      Game.CurrentPlayer.View := Bounds(StartViewPoint.X + StartMousePoint.X - X,
-        StartViewPoint.Y + StartMousePoint.Y - Y,
-        Game.CurrentPlayer.View.Right - Game.CurrentPlayer.View.Left,
-        Game.CurrentPlayer.View.Bottom - Game.CurrentPlayer.View.Top);
+      Game.CurrentPlayer.CellPos := Point(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / Game.CurrentPlayer.ViewZoom),
+        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / Game.CurrentPlayer.ViewZoom));
       Redraw;
     end;
@@ -242 +251 @@
 begin
   with Game.CurrentPlayer do begin
-    D := Point(Trunc(MousePos.X - Game.CurrentPlayer.View.Left / ViewZoom),
-      Trunc(MousePos.Y - Game.CurrentPlayer.View.Top / ViewZoom));
+    //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
+    //  Trunc(MousePos.Y - View.Top / ViewZoom));
     ViewZoom := ViewZoom / ZoomFactor;
     //View := Bounds(Trunc((D.X - MousePos.X) * ViewZoom),

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);