Changeset 234 for trunk

Timestamp:

Sep 19, 2018, 5:28:58 PM (6 years ago)

Author:

chronos

Message:

• Added: Unfinished implementation of cyclic map drawing.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (3 diffs)
• Languages/xtactics.cs.po (modified) (8 diffs)
• UClientGUI.pas (modified) (2 diffs)
• UGeometry.pas (modified) (2 diffs)

trunk/Forms/UFormClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
+  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, Math,
   UGeometry, UGameClient, UGameProtocol, UThreading, UPlayer, UClientGUI;
 
@@ -167 +167 @@
 var
   DrawStart: TDateTime;
+  R: TRect;
+  StartP: TPoint;
+  VS: TPoint;
+  CountP: TPoint;
+  X, Y: Integer;
+  TempView: TView;
 const
   BackgroundColor = $404040;
@@ -185 +191 @@
       PaintBox1.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
       {$endif}
-      Client.Paint(PaintBox1.Canvas, View)
+
+    {  if Game.CyclicMap then begin
+        VS := View.CellToCanvasPos(Game.Map.Size);
+        TempView := TView.Create;
+        TempView.Game := Game;
+        R := TRect.Create(View.CellToCanvasPos(Game.Map.Cells.First.PosPx),
+          View.CellToCanvasPos(Game.Map.Cells.Last.PosPx));
+        StartP := TPoint.Create(Ceil(R.P1.X / R.Size.X) * R.Size.X,
+          Ceil(R.P1.Y / R.Size.Y) * R.Size.Y);
+        CountP := TPoint.Create(Ceil(View.DestRect.Size.X / R.Size.X),
+          Ceil(View.DestRect.Size.X / R.Size.Y));
+        for Y := 0 to CountP.Y do begin
+          for X := 0 to CountP.X do begin
+            TempView.Zoom := View.Zoom;
+            TempView.SourceRect := View.SourceRect;
+            TempView.DestRect := TRect.Create(
+            TPoint.Create(
+              -StartP.X + R.Size.X * X,
+              -StartP.Y + R.Size.Y * Y),
+            TPoint.Create(
+              -StartP.X + R.Size.X * X + View.DestRect.Size.X,
+              -StartP.Y + R.Size.Y * Y + View.DestRect.Size.Y)
+            );
+            Client.Paint(PaintBox1.Canvas, TempView);
+          end;
+        end;
+        TempView.Free;
+      end else
+      }Client.Paint(PaintBox1.Canvas, View);
     end;
   end;

trunk/Languages/xtactics.cs.po

@@ -410 +410 @@
 #: tformnew.checkboxcyclicmap.caption
 msgid "Cyclic map"
-msgstr ""
+msgstr "Cyklická mapa"
 
 #: tformnew.checkboxfogofwar.caption
@@ -758 +758 @@
 #: uclientgui.swrongarrowangle
 msgid "Wrong arrow angle %s"
-msgstr ""
+msgstr "Nesprávný úhel šipky %s"
 
 #: uclientgui.szerozoomnotalowed
-#, fuzzy
 msgctxt "uclientgui.szerozoomnotalowed"
 msgid "Zero zoom not allowed"
@@ -1014 +1013 @@
 
 #: umap.scellremoveneighborerror
-#, fuzzy
 msgctxt "umap.scellremoveneighborerror"
 msgid "Can't remove cell from neighbour cell"
@@ -1020 +1018 @@
 
 #: umap.snegativecellpowernotallowed
-#, fuzzy
 msgctxt "umap.snegativecellpowernotallowed"
 msgid "Not allowed to substract power under zero to negative value"
@@ -1026 +1023 @@
 
 #: uplayer.sattackerpowerpositive
-#, fuzzy
 msgctxt "uplayer.sattackerpowerpositive"
 msgid "Attacker power have to be higher then 0."
@@ -1032 +1028 @@
 
 #: uplayer.sdefenderpowerpositive
-#, fuzzy
 msgctxt "uplayer.sdefenderpowerpositive"
 msgid "Defender power have to be higher then or equal to 0."
@@ -1038 +1033 @@
 
 #: uplayer.sunfinishedbattle
-#, fuzzy
 msgctxt "uplayer.sunfinishedbattle"
 msgid "Unfinished battle"
@@ -1058 +1052 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
-

trunk/UClientGUI.pas

@@ -347 +347 @@
 function TView.CanvasToCellPos(Pos: TPoint): TPoint;
 begin
-  Result := TPoint.Create(Trunc(Pos.X / Zoom + SourceRect.P1.X),
-    Trunc(Pos.Y / Zoom + SourceRect.P1.Y));
+  Result := TPoint.Create(Trunc((Pos.X - DestRect.P1.X) / Zoom + SourceRect.P1.X),
+    Trunc((Pos.Y - DestRect.P1.Y) / Zoom + SourceRect.P1.Y));
 end;
 
 function TView.CellToCanvasPos(Pos: TPoint): TPoint;
 begin
-  Result := TPoint.Create(Trunc((Pos.X - SourceRect.P1.X) * Zoom),
-    Trunc((Pos.Y - SourceRect.P1.Y) * Zoom));
+  Result := TPoint.Create(Trunc((Pos.X - SourceRect.P1.X) * Zoom) + DestRect.P1.X,
+    Trunc((Pos.Y - SourceRect.P1.Y) * Zoom) + DestRect.P1.Y);
 end;
 
@@ -449 +449 @@
     (RectPolygon.P2.Y > RectView.P1.Y)
   );
+  Result := True;
 end;
 

trunk/UGeometry.pas

@@ -53 +53 @@
     procedure SetEmpty;
     procedure Normalize;
+    procedure Move(P: T);
     class operator Equal(const A, B: TGRect<T>): Boolean;
     constructor Create(const P1, P2: T);
@@ -521 +522 @@
 end;
 
+procedure TGRect<T>.Move(P: T);
+begin
+  P1 := P1 + P;
+  P2 := P2 + P;
+end;
+
 constructor TGRect<T>.Create(const P1, P2: T);
 begin