Changeset 170 for trunk/Forms/UFormMain.pas

Timestamp:

Nov 23, 2017, 5:02:49 PM (6 years ago)

Author:

chronos

Message:

• Modified: UGeometry unit rewritten to use generics and define own TPoint and TRect types.

File:

• trunk/Forms/UFormMain.pas (modified) (9 diffs)

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, types, dateutils, XMLConf, DOM;
+  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
+  UGeometry;
 
 const
@@ -137 +138 @@
   if Assigned(Core.CurrentClient) then
   with Core.CurrentClient do begin
-    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
     if csOpaque in PaintBox1.ControlStyle then begin
       TempBitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
@@ -166 +167 @@
   if Assigned(Core.CurrentClient) then
   with Core.CurrentClient do
-    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
   Redraw;
 end;
@@ -252 +253 @@
   with Core, Game, CurrentClient, View do begin
     MapRect := Map.CalculatePixelRect;
-    Factor := FloatPoint((DestRect.Right - DestRect.Left) / (MapRect.Right - MapRect.Left),
-      (DestRect.Bottom - DestRect.Top) / (MapRect.Bottom - MapRect.Top));
+    Factor := FloatPoint(DestRect.Size.X / MapRect.Size.X,
+      DestRect.Size.Y / MapRect.Size.Y);
     if Factor.X < Factor.Y then NewZoom := Factor.X
       else NewZoom := Factor.Y;
@@ -342 +343 @@
   if Button = mbLeft then begin
     if Assigned(Core.CurrentClient) then begin
-      StartMousePoint := Point(X, Y);
-      StartViewPoint := Core.CurrentClient.View.SourceRect.TopLeft;
+      StartMousePoint := TPoint.Create(X, Y);
+      StartViewPoint := Core.CurrentClient.View.SourceRect.P1;
       MoveActive := True;
     end;
@@ -366 +367 @@
     (Abs(StartMousePoint.Y - Y) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) then
     with Core.Game.CurrentPlayer, Core.CurrentClient do begin
-      View.SourceRect := Bounds(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
-        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom),
-        View.SourceRect.Right - View.SourceRect.Left,
-        View.SourceRect.Bottom - View.SourceRect.Top);
+      View.SourceRect := TRect.CreateBounds(TPoint.Create(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
+        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom)),
+        View.SourceRect.Size);
       Redraw;
     end;
@@ -375 +375 @@
     OldCell := Core.CurrentClient.View.FocusedCell;
     with Core.Game do
-      Cell := Map.PosToCell(Core.CurrentClient.View.CanvasToCellPos(Point(X, Y)), Core.CurrentClient.View );
+      Cell := Map.PosToCell(Core.CurrentClient.View.CanvasToCellPos(TPoint.Create(X, Y)), Core.CurrentClient.View );
     if Assigned(Cell) then begin
       Core.CurrentClient.View.FocusedCell := Cell;
@@ -384 +384 @@
       StatusBar1.Panels[0].Text := '';
     end;
-    CellPos := Core.CurrentClient.View.CanvasToCellPos(Point(X, Y));
+    CellPos := Core.CurrentClient.View.CanvasToCellPos(TPoint.Create(X, Y));
     StatusBar1.Panels[2].Text := 'CellPos: ' + IntToStr(CellPos.X) + ', ' + IntToStr(CellPos.Y);
     if Cell <> OldCell then Redraw;
@@ -396 +396 @@
   (Abs(StartMousePoint.Y - Y) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.CurrentClient.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer, Shift);
+      Core.CurrentClient.View.SelectCell(TPoint.Create(X, Y), Core.Game.CurrentPlayer, Shift);
       Redraw;
     end;