Changeset 51 for trunk

Timestamp:

Aug 17, 2014, 1:22:26 PM (10 years ago)

Author:

chronos

Message:

• Modified: Function to paint cell moved from THexMap and TSquareMap to single generic implementation PaintCell in TMap class.

File:

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

trunk/UGame.pas

@@ -85 +85 @@
     FSize: TPoint;
     function GetSize: TPoint; virtual;
+    procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
+      Cell: TCell);
     procedure SetSize(AValue: TPoint); virtual;
   public
@@ -468 +470 @@
   PosFrom, PosTo: TPoint;
   Angle: Double;
-
-procedure PaintHexagon(Pos: TPoint; Text: string);
-var
-  TextPos: TPoint;
-  I: Integer;
-begin
-  with Canvas do begin
-    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY * FSize.X + CX])) then begin
-      Pen.Color := clYellow;
-      Pen.Style := psSolid;
-      Pen.Width := 1;
-    end else
-    if TCell(Cells[CY * FSize.X + CX]).Terrain = ttCity then begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := clBlack;
-      Pen.Style := psSolid;
-      Pen.Width := 3;
-    end else begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := Brush.Color;
-      Pen.Style := psSolid;
-      Pen.Width := 0;
-    end;
-    // Transform view
-    SetLength(Points, Length(TCell(Cells[CY * FSize.X + CX]).Polygon));
-    for I := 0 to Length(Points) - 1 do
-      Points[I] := View.CellToCanvasPos(TCell(Cells[CY * FSize.X + CX]).Polygon[I]);
-
-    Polygon(Points, False, 0, Length(Points));
-    //Rectangle(Trunc(Pos.X), Trunc(Pos.Y), Trunc(Pos.X + HexSize.X), Trunc(Pos.Y + HexSize.Y));
-    Pen.Style := psSolid;
-    Font.Color := clWhite;
-    Font.Size := Trunc(12 * View.Zoom);
-    TextPos := View.CellToCanvasPos(Pos);
-    TextOut(Round(TextPos.X) - TextWidth(Text) div 2, Round(TextPos.Y) - TextHeight(Text) div 2, Text);
-  end;
-end;
-
 begin
   CellSize := FloatPoint(DefaultCellSize.X * SquareCellMulX, DefaultCellSize.Y * SquareCellMulY);
@@ -525 +487 @@
             else Brush.Color := Cell.GetColor;
           Pen.Color := clBlack;
-          PaintHexagon(Point(Trunc(X * CellSize.X),
+          PaintCell(Canvas, Point(Trunc(X * CellSize.X),
             Trunc(Y * CellSize.Y)),
-            IntToStr(Cell.GetAvialPower));
+            IntToStr(Cell.GetAvialPower), View, TCell(Cells[CY * FSize.X + CX]));
           // Draw arrows
           Pen.Color := clCream;
@@ -670 +632 @@
       if Power > MaxPower then Power := MaxPower;
     end;
+  end;
+end;
+
+procedure TMap.PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
+  Cell: TCell);
+var
+  I: Integer;
+  TextPos: TPoint;
+  Points: array of TPoint;
+begin
+  with Canvas do begin
+    if Assigned(View.FocusedCell) and (View.FocusedCell = Cell) then begin
+      Pen.Color := clYellow;
+      Pen.Style := psSolid;
+      Pen.Width := 1;
+    end else
+    if Cell.Terrain = ttCity then begin
+      // Cannot set clear border as it will display shifted on gtk2
+      //Pen.Style := psClear;
+      Pen.Color := clBlack;
+      Pen.Style := psSolid;
+      Pen.Width := 3;
+    end else begin
+      // Cannot set clear border as it will display shifted on gtk2
+      //Pen.Style := psClear;
+      Pen.Color := Brush.Color;
+      Pen.Style := psSolid;
+      Pen.Width := 0;
+    end;
+    // Transform view
+    SetLength(Points, Length(Cell.Polygon));
+    for I := 0 to Length(Points) - 1 do
+      Points[I] := View.CellToCanvasPos(Cell.Polygon[I]);
+
+    Polygon(Points, False, 0, Length(Points));
+    Pen.Style := psSolid;
+    Font.Color := clWhite;
+    Font.Size := Trunc(12 * View.Zoom);
+    TextPos := View.CellToCanvasPos(Pos);
+    TextOut(Round(TextPos.X) - TextWidth(Text) div 2, Round(TextPos.Y) - TextHeight(Text) div 2, Text);
   end;
 end;
@@ -1615 +1617 @@
   Angle: Double;
   ArrowCenter: TPoint;
-
-procedure PaintHexagon(Pos: TPoint; Text: string; View: TView);
-var
-  I: Integer;
-  TextPos: TPoint;
-begin
-  with Canvas do begin
-    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY * FSize.X + CX])) then begin
-      Pen.Color := clYellow;
-      Pen.Style := psSolid;
-      Pen.Width := 1;
-    end else
-    if TCell(Cells[CY * FSize.X + CX]).Terrain = ttCity then begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := clBlack;
-      Pen.Style := psSolid;
-      Pen.Width := 3;
-    end else begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := Brush.Color;
-      Pen.Style := psSolid;
-      Pen.Width := 0;
-    end;
-    // Transform view
-    SetLength(Points, Length(TCell(Cells[CY * FSize.X + CX]).Polygon));
-    for I := 0 to Length(Points) - 1 do
-      Points[I] := View.CellToCanvasPos(TCell(Cells[CY * FSize.X + CX]).Polygon[I]);
-
-    Polygon(Points, False, 0, Length(Points));
-    //Rectangle(Trunc(Pos.X), Trunc(Pos.Y), Trunc(Pos.X + HexSize.X), Trunc(Pos.Y + HexSize.Y));
-    Pen.Style := psSolid;
-    Font.Color := clWhite;
-    Font.Size := Trunc(12 * View.Zoom);
-    TextPos := View.CellToCanvasPos(Pos);
-    TextOut(Round(TextPos.X) - TextWidth(Text) div 2, Round(TextPos.Y) - TextHeight(Text) div 2, Text);
-  end;
-end;
-
 begin
   CellSize := FloatPoint(DefaultCellSize.X / HexCellMulX, DefaultCellSize.Y / HexCellMulY);
@@ -1677 +1639 @@
             else Brush.Color := Cell.GetColor;
           Pen.Color := clBlack;
-          PaintHexagon(Point(Trunc(X * CellSize.X),
+          PaintCell(Canvas, Point(Trunc(X * CellSize.X),
             Trunc(Y * CellSize.Y)),
-            IntToStr(Cell.GetAvialPower), View);
+            IntToStr(Cell.GetAvialPower), View, TCell(Cells[CY * FSize.X + CX]));
           // Draw arrows
           Pen.Color := clCream;