Changeset 236 for trunk

Timestamp:

Sep 20, 2018, 3:33:04 PM (6 years ago)

Author:

chronos

Message:

• Added: Mouse focused and selected cells are now working.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (5 diffs)
• UClientGUI.pas (modified) (1 diff)
• UGeometry.pas (modified) (4 diffs)

trunk/Forms/UFormClient.pas

@@ -169 +169 @@
   R: TRect;
   StartP: TPoint;
-  VS: TPoint;
   CountP: TPoint;
   X, Y: Integer;
@@ -193 +192 @@
 
       if Game.CyclicMap then begin
-        VS := View.CellToCanvasPos(Game.Map.Size);
         TempView := TView.Create;
         TempView.Game := Game;
@@ -493 +491 @@
   OldCell: TPlayerCell;
   CellPos: TPoint;
+  P: TPoint;
+  R: TRect;
 begin
   if Assigned(Client) then begin
+    P := TPoint.Create(X, Y);
     if MoveActive then
     if (Abs(StartMousePoint.X - X) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) or
     (Abs(StartMousePoint.Y - Y) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) then
     with Client do begin
-      View.SourceRect := TRect.CreateBounds(TPoint.Create(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
+      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);
@@ -507 +509 @@
     OldCell := Client.View.FocusedCell;
     with Core.Game do
-      if Assigned(Client.ControlPlayer) then
-        Cell := Client.ControlPlayer.PlayerMap.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)));
-        //else Cell := Client.Game.Map.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
+      if Assigned(Client.ControlPlayer) then begin
+        if Map.Cyclic then begin
+          R := Client.View.CellToCanvasRect(Map.PixelRect);
+          CellPos := TPoint.Create(
+            ModNeg(P.X - R.P1.X, R.Size.X) + R.P1.X,
+            ModNeg(P.Y - R.P1.Y, R.Size.Y) + R.P1.Y
+          );
+          Cell := Client.ControlPlayer.PlayerMap.PosToCell(
+          Client.View.CanvasToCellPos(CellPos));
+        end else begin
+          Cell := Client.ControlPlayer.PlayerMap.PosToCell(
+            Client.View.CanvasToCellPos(P));
+        end;
+      end;
     if Assigned(Cell) then begin
       Client.View.FocusedCell := Cell;
@@ -530 +543 @@
   (Abs(StartMousePoint.Y - Y) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) and
-      (Core.Game.CurrentPlayer = Client.ControlPlayer) then begin
+    (Core.Game.CurrentPlayer = Client.ControlPlayer) then begin
       Client.View.SelectCell(TPoint.Create(X, Y), Client.ControlPlayer, Shift);
       Redraw;

trunk/UClientGUI.pas

@@ -383 +383 @@
   UnitMove: TUnitMove;
   I: Integer;
-begin
-  NewSelectedCell := Player.PlayerMap.PosToCell(CanvasToCellPos(Pos));
+  CellPos: TPoint;
+  R: TRect;
+begin
+  if TGame(Game).Map.Cyclic then begin
+    R := CellToCanvasRect(TGame(Game).Map.PixelRect);
+    CellPos := TPoint.Create(
+      ModNeg(Pos.X - R.P1.X, R.Size.X) + R.P1.X,
+      ModNeg(Pos.Y - R.P1.Y, R.Size.Y) + R.P1.Y
+    );
+    NewSelectedCell := Player.PlayerMap.PosToCell(
+      CanvasToCellPos(CellPos));
+  end else begin
+    NewSelectedCell := Player.PlayerMap.PosToCell(
+      CanvasToCellPos(Pos));
+  end;
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and TGame(Game).Map.IsCellsNeighbor(NewSelectedCell.MapCell, SelectedCell.MapCell) then begin

trunk/UGeometry.pas

@@ -25 +25 @@
     class operator Multiply(const A, B: TGPoint<T>): TGPoint<T>;
     //class operator Divide(const A, B: TGPoint<T>): TGPoint<T>;
+    //class operator Modulus(A: TGPoint<T>; B: TGPoint<T>): TGPoint<T>;
     function Min(const A, B: TGPoint<T>): TGPoint<T>;
     function Max(const A, B: TGPoint<T>): TGPoint<T>;
@@ -120 +121 @@
   TPolygonF = TGPolygon<TPointF>;
 
+function TypedMod(Numerator, Denominator: Integer): Integer; overload;
+function TypedMod(Numerator, Denominator: Single): Single; overload;
 function TypedDivide(Divident, Divisor: Integer): Integer; overload;
 function TypedDivide(Divident, Divisor: Single): Single; overload;
@@ -126 +129 @@
 function StdPointToPoint(Value: Classes.TPoint): TPoint;
 function PointToStdPoint(Value: TPoint): Classes.TPoint;
+function ModNeg(A, B: Integer): Integer;
 
 
 implementation
+
+function ModNeg(A, B: Integer): Integer;
+begin
+  if A < 0 then A := A + Ceil(-A / B) * B;
+  Result := A mod B;
+end;
+
+function TypedMod(Numerator, Denominator: Integer): Integer; overload;
+begin
+  Result := Numerator mod Denominator;
+end;
+
+function TypedMod(Numerator, Denominator: Single): Single; overload;
+begin
+  //Result := FMod(Numerator, Denominator);
+end;
 
 function TypedDivide(Divident, Divisor: Integer): Integer;
@@ -443 +463 @@
   Result.Y := TypedDivide(A.Y, B.Y);
 end;
+
+class operator TGPoint<T>.Modulus(A: TGPoint<T>; B: TGPoint<T>): TGPoint<T>;
+begin
+  Result.X := TypedMod(A.X, B.X);
+  Result.Y := TypedMod(A.Y, B.Y);
+end;
 }