Changeset 268 for trunk/UClientGUI.pas

Timestamp:

Jan 20, 2019, 9:32:16 PM (6 years ago)

Author:

chronos

Message:

• Added: New menu action show/hide map grid lines.
• Modified: Draw cell polygons without a gap so it can be drawn as solid surface without grid lines.

File:

• trunk/UClientGUI.pas (modified) (7 diffs)

trunk/UClientGUI.pas

@@ -48 +48 @@
   public
     View: TView;
+    ShowCellGrid: Boolean;
     procedure DrawArrow(Canvas: TCanvas; Pos: TPoint; Angle: Double;
       Text: string; View: TView);
@@ -58 +59 @@
     procedure DrawCellLinks(Canvas: TCanvas; View: TView);
     procedure DrawNeighborLinks(Canvas: TCanvas; View: TView);
+    procedure DrawCities(Canvas: TCanvas; View: TView);
+    procedure DrawSelection(Canvas: TCanvas; View: TView);
     procedure Paint(Canvas: TCanvas; View: TView);
     constructor Create; override;
@@ -107 +110 @@
   end;
   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.MapCell.Terrain = ttCity then begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
+    // Cannot set clear border as it will display shifted on gtk2
+    //Pen.Style := psClear;
+    Pen.Style := psSolid;
+    if ShowCellGrid then begin
       Pen.Color := clBlack;
-      Pen.Style := psSolid;
-      Pen.Width := 3;
+      Pen.Width := Round(2 * View.Zoom);
     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.MapCell.Polygon.Points));
@@ -130 +126 @@
       Points[I] := PointToStdPoint(View.CellToCanvasPos(Cell.MapCell.Polygon.Points[I]));
     Brush.Style := bsSolid;
-    //Polygon(Points, False, 0, Length(Points));
     TCanvasEx.PolygonEx(Canvas, Points, False);
-    //MoveTo(Points[0].X, Points[0].Y);
-    //LineTo(Points[1].X, Points[1].Y);
 
     // Show cell text
@@ -237 +230 @@
         not ControlPlayer.PlayerMap.Cells.SearchCell(Move.CellTo.MapCell).InVisibleRange then
         Continue;
-      if Move.CountRepeat > 0 then Pen.Width := 2
-        else Pen.Width := 1;
+      if Move.CountRepeat > 0 then Pen.Width := Round(2 * View.Zoom)
+        else Pen.Width := Round(1 * View.Zoom);
       Angle := ArcTan2(PosTo.Y - PosFrom.Y, PosTo.X - PosFrom.X);
       if (Angle > +Pi) or (Angle < -Pi) then
@@ -312 +305 @@
   MapCell: TCell;
   CellText: string;
+  Points: array of Classes.TPoint;
+  I: Integer;
 begin
   with Canvas, View do begin
@@ -404 +399 @@
 end;
 
+procedure TClientGUI.DrawCities(Canvas: TCanvas; View: TView);
+var
+  Cell: TPlayerCell;
+  MapCell: TCell;
+  CellText: string;
+  Points: array of Classes.TPoint;
+  I: Integer;
+begin
+  with Canvas, View do begin
+    if Assigned(ControlPlayer) then begin
+      for Cell in ControlPlayer.PlayerMap.Cells do begin
+        if (Cell.MapCell.Terrain <> ttVoid) and View.IsCellVisible(Cell.MapCell) then begin
+          if Cell.MapCell.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 := Round(6 * View.Zoom);
+
+            // Transform view
+            SetLength(Points, Length(Cell.MapCell.Polygon.Points) + 1);
+            for I := 0 to Length(Cell.MapCell.Polygon.Points) - 1 do
+              Points[I] := PointToStdPoint(View.CellToCanvasPos(Cell.MapCell.Polygon.Points[I]));
+            Points[Length(Points) - 1] := Points[0];
+            TCanvasEx.PolyLineEx(Canvas, Points);
+          end;
+        end;
+      end;
+    end else begin
+      for MapCell in TGame(Game).Map.Cells do begin
+        if (MapCell.Terrain <> ttVoid) and View.IsCellVisible(MapCell) then begin
+          if View.IsCellVisible(MapCell) and (MapCell.Terrain <> ttVoid) then begin
+            if MapCell.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 := Round(6 * View.Zoom);
+
+              // Transform view
+              SetLength(Points, Length(MapCell.Polygon.Points) + 1);
+              for I := 0 to Length(MapCell.Polygon.Points) - 1 do
+                Points[I] := PointToStdPoint(View.CellToCanvasPos(MapCell.Polygon.Points[I]));
+              Points[Length(Points) - 1] := Points[0];
+              TCanvasEx.PolyLineEx(Canvas, Points);
+            end;
+          end;
+        end;
+      end;
+    end;
+  end;
+end;
+
+procedure TClientGUI.DrawSelection(Canvas: TCanvas; View: TView);
+var
+  Cell: TPlayerCell;
+  MapCell: TCell;
+  CellText: string;
+  Points: array of Classes.TPoint;
+  I: Integer;
+begin
+  with Canvas, View do begin
+    if Assigned(ControlPlayer) then begin
+      if Assigned(View.FocusedCell) then begin
+        Pen.Color := clYellow;
+        Pen.Style := psSolid;
+        Pen.Width := Round(2 * View.Zoom);
+
+        // Transform view
+        SetLength(Points, Length(View.FocusedCell.MapCell.Polygon.Points) + 1);
+        for I := 0 to Length(View.FocusedCell.MapCell.Polygon.Points) - 1 do
+          Points[I] := PointToStdPoint(View.CellToCanvasPos(View.FocusedCell.MapCell.Polygon.Points[I]));
+        Points[Length(Points) - 1] := Points[0];
+        TCanvasEx.PolyLineEx(Canvas, Points);
+      end;
+    end;
+  end;
+end;
+
 { TView }