Changeset 238

Timestamp:

Sep 21, 2018, 12:15:23 AM (6 years ago)

Author:

chronos

Message:

• Modified: Enabled back drawing only of visible cells.
• Added: Draw only visible arrows between cells.

Location:

trunk

Files:

• Languages/xtactics.cs.po (modified) (2 diffs)
• Languages/xtactics.po (modified) (1 diff)
• UClientGUI.pas (modified) (6 diffs)
• UGame.pas (modified) (1 diff)
• UMap.pas (modified) (2 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/Languages/xtactics.cs.po

@@ -1004 +1004 @@
 msgstr "Divák"
 
-#: ugame.sunitpowermismatch
-msgid "Unit move power mismatch. Cell power is %d but %d moved away."
-msgstr "Chyba síly přesunu jednotek. Síla buňky je %d, ale %d přesunuto pryč."
-
 #: ugame.swrongfileformat
 msgid "Wrong file format"
@@ -1052 +1048 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
+

trunk/Languages/xtactics.po

@@ -983 +983 @@
 msgstr ""
 
-#: ugame.sunitpowermismatch
-msgid "Unit move power mismatch. Cell power is %d but %d moved away."
-msgstr ""
-
 #: ugame.swrongfileformat
 msgid "Wrong file format"

trunk/UClientGUI.pas

@@ -32 +32 @@
     function CanvasToCellPos(Pos: TPoint): TPoint;
     function CellToCanvasPos(Pos: TPoint): TPoint;
+    function CellToCanvasPosF(Pos: TPointF): TPointF;
     function CanvasToCellRect(Pos: TRect): TRect;
     function CellToCanvasRect(Pos: TRect): TRect;
+    function CellToCanvasRectF(Pos: TRectF): TRectF;
     procedure Assign(Source: TView);
     property DestRect: TRect read FDestRect write SetDestRect;
@@ -46 +48 @@
   public
     View: TView;
+    procedure DrawArrow(Canvas: TCanvas; Pos: TPoint; Angle: Double;
+      Text: string; View: TView);
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
       Cell: TPlayerCell);
@@ -242 +246 @@
 
       if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-      ArrowCenter := View.CellToCanvasPos(TPoint.Create(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
-        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
-      TGame(Game).Map.DrawArrow(Canvas, ArrowCenter,
-        Angle, IntToStr(Move.CountOnce), View.Zoom);
-    end;
-  end;
-end;
+      ArrowCenter := View.CellToCanvasPos(TPoint.Create(
+        Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)
+      ));
+      DrawArrow(Canvas, ArrowCenter,
+        Angle, IntToStr(Move.CountOnce), View);
+    end;
+  end;
+end;
+
+procedure TClientGUI.DrawArrow(Canvas: TCanvas; Pos: TPoint;
+  Angle: Double; Text: string; View: TView);
+var
+  Points: array of Classes.TPoint;
+  Arrow: TPolygonF;
+  I: Integer;
+  ArrowSize: TPoint;
+  RectPolygon: TRectF;
+begin
+  SetLength(Arrow.Points, 8);
+  ArrowSize := TPoint.Create(Trunc(TGame(Game).Map.DefaultCellSize.X / 3 * View.Zoom),
+    Trunc(TGame(Game).Map.DefaultCellSize.Y / 3 * View.Zoom));
+  Arrow.Points[0] := TPointF.Create(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
+  Arrow.Points[1] := TPointF.Create(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
+  Arrow.Points[2] := TPointF.Create(+0 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  Arrow.Points[3] := TPointF.Create(-0.5 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  Arrow.Points[4] := TPointF.Create(-0.5 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  Arrow.Points[5] := TPointF.Create(+0 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  Arrow.Points[6] := TPointF.Create(+0 * ArrowSize.X, -0.5 * ArrowSize.Y);
+  Arrow.Points[7] := TPointF.Create(+0.5 * ArrowSize.X, 0 * ArrowSize.Y);
+  // Rotate
+  for I := 0 to Length(Arrow.Points) - 1 do begin
+    Arrow.Points[I] := TPointF.Create(
+      Arrow.Points[I].X * Cos(Angle) - Arrow.Points[I].Y * Sin(Angle),
+      Arrow.Points[I].X * Sin(Angle) + Arrow.Points[I].Y * Cos(Angle)
+    );
+    Arrow.Points[I] := Arrow.Points[I] + TPointF.Create(Pos.X, Pos.Y);
+  end;
+
+  RectPolygon := Arrow.GetRect;
+  if (RectPolygon.P1.X < View.DestRect.Size.X) and
+    (RectPolygon.P2.X > 0) and
+    (RectPolygon.P1.Y < View.DestRect.Size.Y) and
+    (RectPolygon.P2.Y > 0) then begin
+
+    // Convert to standard points
+    SetLength(Points, 8);
+    for I := 0 to Length(Points) - 1 do
+      Points[I] := Point(Trunc(Arrow[I].X), Trunc(Arrow[I].Y));
+    with Canvas do begin
+      Pen.Color := clBlack;
+      Brush.Color := clWhite;
+      Brush.Style := bsSolid;
+      Polygon(Points);
+      Brush.Style := bsClear;
+      Font.Color := clBlack;
+      Font.Size := Trunc(18 * View.Zoom);
+      TextOut(Pos.X - TextWidth(Text) div 2, Pos.Y - TextHeight(Text) div 2, Text);
+      Pen.Width := 1;
+    end;
+  end;
+end;
+
 
 procedure TClientGUI.DrawCells(Canvas: TCanvas; View: TView);
@@ -396 +456 @@
 end;
 
+function TView.CellToCanvasPosF(Pos: TPointF): TPointF;
+begin
+  Result := TPointF.Create((Pos.X - SourceRect.P1.X) * Zoom + DestRect.P1.X,
+    (Pos.Y - SourceRect.P1.Y) * Zoom + DestRect.P1.Y);
+end;
+
 function TView.CanvasToCellRect(Pos: TRect): TRect;
 begin
@@ -406 +472 @@
   Result.P1 := CellToCanvasPos(Pos.P1);
   Result.P2 := CellToCanvasPos(Pos.P2);
+end;
+
+function TView.CellToCanvasRectF(Pos: TRectF): TRectF;
+begin
+  Result.P1 := CellToCanvasPosF(Pos.P1);
+  Result.P2 := CellToCanvasPosF(Pos.P2);
 end;
 
@@ -491 +563 @@
 function TView.IsCellVisible(Cell: TCell): Boolean;
 var
-  RectPolygon, RectView: TRect;
-begin
-  RectPolygon := Cell.Polygon.GetRect;
-  RectView := SourceRect;
+  RectPolygon: TRect;
+begin
+  RectPolygon := CellToCanvasRect(Cell.Polygon.GetRect);
   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)
+    (RectPolygon.P1.X < DestRect.Size.X) and
+    (RectPolygon.P2.X > 0) and
+    (RectPolygon.P1.Y < DestRect.Size.Y) and
+    (RectPolygon.P2.Y > 0)
   );
-  Result := True;
 end;
 

trunk/UGame.pas

@@ -127 +127 @@
   SWrongFileFormat = 'Wrong file format';
   SNewGameFile = 'New game.xtg';
-  SUnitPowerMismatch = 'Unit move power mismatch. Cell power is %d but %d moved away.';
 
 procedure InitStrings;

trunk/UMap.pas

@@ -155 +155 @@
     Areas: TMapAreas;
     Cyclic: Boolean;
-    procedure DrawArrow(Canvas: TCanvas; Pos: TPoint; Angle: Double;
-      Text: string; Zoom: Double);
     function IsOutsideShape(Coord: TPoint): Boolean; virtual;
     function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean; virtual;
@@ -549 +547 @@
 end;
 
-procedure TMap.DrawArrow(Canvas: TCanvas; Pos: TPoint;
-  Angle: Double; Text: string; Zoom: Double);
-var
-  Points: array of Classes.TPoint;
-  FPoints: array of TPointF;
-  I: Integer;
-  ArrowSize: TPoint;
-begin
-  Canvas.Brush.Color := clWhite;
-  Canvas.Pen.Color := clBlack;
-  SetLength(Points, 8);
-  SetLength(FPoints, 8);
-  ArrowSize := TPoint.Create(Trunc(DefaultCellSize.X / 3 * Zoom),
-    Trunc(DefaultCellSize.Y / 3 * Zoom));
-  FPoints[0] := TPointF.Create(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
-  FPoints[1] := TPointF.Create(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
-  FPoints[2] := TPointF.Create(+0 * ArrowSize.X, +0.25 * ArrowSize.Y);
-  FPoints[3] := TPointF.Create(-0.5 * ArrowSize.X, +0.25 * ArrowSize.Y);
-  FPoints[4] := TPointF.Create(-0.5 * ArrowSize.X, -0.25 * ArrowSize.Y);
-  FPoints[5] := TPointF.Create(+0 * ArrowSize.X, -0.25 * ArrowSize.Y);
-  FPoints[6] := TPointF.Create(+0 * ArrowSize.X, -0.5 * ArrowSize.Y);
-  FPoints[7] := TPointF.Create(+0.5 * ArrowSize.X, 0 * ArrowSize.Y);
-  // Rotate
-  for I := 0 to Length(Points) - 1 do
-    FPoints[I] := TPointF.Create(FPoints[I].X * Cos(Angle) - FPoints[I].Y * Sin(Angle),
-      FPoints[I].X * Sin(Angle) + FPoints[I].Y * Cos(Angle));
-  // Shift
-  for I := 0 to Length(Points) - 1 do
-    Points[I] := Point(Trunc(FPoints[I].X + Pos.X), Trunc(FPoints[I].Y + Pos.Y));
-  with Canvas do begin
-    Brush.Style := bsSolid;
-    Polygon(Points);
-    Brush.Style := bsClear;
-    Font.Color := clBlack;
-    Font.Size := Trunc(26 * Zoom);
-    TextOut(Pos.X - TextWidth(Text) div 2,
-      Pos.Y - TextHeight(Text) div 2, Text);
-    Pen.Width := 1;
-  end;
-end;
-
 function TMap.IsCellsNeighbor(Cell1, Cell2: TCell): Boolean;
 begin

trunk/xtactics.lpr

@@ -11 +11 @@
   CoolTranslator, TemplateGenerics
   { you can add units after this },
-  SysUtils, UFormMain, CoolStreaming, UMap, UPlayer, UClientGUI;
+  SysUtils, UFormMain, CoolStreaming;
 
 {$R *.res}