Changeset 235 for trunk

Timestamp:

Sep 20, 2018, 11:44:42 AM (6 years ago)

Author:

chronos

Message:

• Added: Show map multiple times side by side in cyclic mode.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (3 diffs)
• UGeometry.pas (modified) (6 diffs)
• UMapType.pas (modified) (13 diffs)
• UPlayer.pas (modified) (1 diff)

trunk/Forms/UFormClient.pas

@@ -192 +192 @@
       {$endif}
 
-    {  if Game.CyclicMap then begin
+      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));
+        //R := View.CellToCanvasRect(TRect.Create(Game.Map.Cells.First.PosPx,
+        //  Game.Map.Cells.Last.PosPx));
+        R := View.CellToCanvasRect(Game.Map.PixelRect);
         StartP := TPoint.Create(Ceil(R.P1.X / R.Size.X) * R.Size.X,
           Ceil(R.P1.Y / R.Size.Y) * R.Size.Y);
@@ -204 +205 @@
         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.Assign(View);
             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)
+              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);
@@ -219 +221 @@
         TempView.Free;
       end else
-      }Client.Paint(PaintBox1.Canvas, View);
+      Client.Paint(PaintBox1.Canvas, View);
     end;
   end;

trunk/UGeometry.pas

@@ -24 +24 @@
     class operator Equal(const A, B: TGPoint<T>): Boolean;
     class operator Multiply(const A, B: TGPoint<T>): TGPoint<T>;
+    //class operator Divide(const A, B: TGPoint<T>): TGPoint<T>;
     function Min(const A, B: TGPoint<T>): TGPoint<T>;
     function Max(const A, B: TGPoint<T>): TGPoint<T>;
@@ -119 +120 @@
   TPolygonF = TGPolygon<TPointF>;
 
-function Divide(Divident, Divisor: Integer): Integer; overload;
-function Divide(Divident, Divisor: Double): Double; overload;
+function TypedDivide(Divident, Divisor: Integer): Integer; overload;
+function TypedDivide(Divident, Divisor: Single): Single; overload;
 function TypedRound(Value: Double): Integer; overload;
 function TypedRound(Value: Double): Double; overload;
@@ -129 +130 @@
 implementation
 
-function Divide(Divident, Divisor: Integer): Integer;
+function TypedDivide(Divident, Divisor: Integer): Integer;
 begin
   Result := Divident div Divisor;
 end;
 
-function Divide(Divident, Divisor: Double): Double;
+function TypedDivide(Divident, Divisor: Single): Single;
 begin
   Result := Divident / Divisor;
@@ -334 +335 @@
 function TGLine<T>.GetMiddle: T;
 begin
-  Result := T.Create(P1.X + Divide((P2.X - P1.X), 2), P1.Y + Divide((P2.Y - P1.Y), 2));
+  Result := T.Create(P1.X + TypedDivide((P2.X - P1.X), 2), P1.Y + TypedDivide((P2.Y - P1.Y), 2));
 end;
 
@@ -437 +438 @@
 end;
 
+{class operator TGPoint<T>.Divide(const A, B: TGPoint<T>): TGPoint<T>;
+begin
+  Result.X := TypedDivide(A.X, B.X);
+  Result.Y := TypedDivide(A.Y, B.Y);
+end;
+}
+
 class operator TGPoint<T>.GreaterThan(const A, B: TGPoint<T>): Boolean;
 begin
@@ -508 +516 @@
 function TGRect<T>.Center: T;
 begin
-  Result.X := Divide(P2.X - P1.X, 2);
-  Result.Y := Divide(P2.Y - P1.Y, 2);
+  Result.X := TypedDivide(P2.X - P1.X, 2);
+  Result.Y := TypedDivide(P2.Y - P1.Y, 2);
 end;
 

trunk/UMapType.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, XMLRead, XMLWrite, DOM, UGeometry, fgl, UMap;
-
-const
-  SquareCellMulX = 1.05;
-  SquareCellMulY = 1.05;
-  TriangleCellMulX = 0.55;
-  TriangleCellMulY = 1.05;
 
 type
@@ -32 +26 @@
     function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPolygon;
   public
+    function CalculatePixelRect: TRect; override;
     procedure LoadFromFile(FileName: string); override;
     procedure SaveToFile(FileName: string); override;
@@ -41 +36 @@
   TSquareMap = class(TMap)
   private
+    const
+      CellMulX = 1.05;
+      CellMulY = 1.05;
     function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPolygon;
   public
     procedure Generate; override;
+    function CalculatePixelRect: TRect; override;
   end;
 
@@ -50 +49 @@
   TTriangleMap = class(TMap)
   private
+    const
+      CellMulX = 0.55;
+      CellMulY = 1.05;
     function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPolygon;
   public
     procedure Generate; override;
+    function CalculatePixelRect: TRect; override;
   end;
 
@@ -61 +64 @@
   public
     procedure Generate; override;
+    function CalculatePixelRect: TRect; override;
   end;
 
@@ -73 +77 @@
   public
     procedure Generate; override;
+    function CalculatePixelRect: TRect; override;
   end;
 
@@ -147 +152 @@
 
   FPixelRect := CalculatePixelRect;
+end;
+
+function TIsometricMap.CalculatePixelRect: TRect;
+begin
+  Result := inherited CalculatePixelRect;
+  Result.P2 := Result.P2 - TPoint.Create(
+    Trunc(0.45 * DefaultCellSize.X / CellMulX),
+    Trunc(0.90 * DefaultCellSize.Y / CellMulY)
+  );
 end;
 
@@ -165 +179 @@
   Result.Points[4] := TPoint.Create(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
   Result.Points[5] := TPoint.Create(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
+end;
+
+function THexMap.CalculatePixelRect: TRect;
+var
+  Shift: TPointF;
+  Angle: Double;
+begin
+  Result := inherited CalculatePixelRect;
+  Angle := 30 / 180 * Pi;
+  Shift := TPointF.Create(0.5, 0.5) * TPointF.Create(Cos(Angle), Sin(Angle));
+  Result.P2 := Result.P2 - TPoint.Create(
+    Trunc(0.47 * DefaultCellSize.X / CellMulX),
+    Trunc(1.2 * Shift.Y * DefaultCellSize.Y / CellMulY)
+  );
 end;
 
@@ -293 +321 @@
     NewCell := TCell.Create;
     NewCell.Map := Self;
-    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X * SquareCellMulX),
-      Trunc(Y * DefaultCellSize.Y * SquareCellMulY));
+    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X * CellMulX),
+      Trunc(Y * DefaultCellSize.Y * CellMulY));
     NewCell.Polygon := GetSquarePolygon(NewCell.PosPx, DefaultCellSize);
     NewCell.Id := GetNewCellId;
@@ -330 +358 @@
 
   FPixelRect := CalculatePixelRect;
+end;
+
+function TSquareMap.CalculatePixelRect: TRect;
+begin
+  Result := inherited CalculatePixelRect;
+  Result.P2 := Result.P2 + TPoint.Create(
+    Trunc(0.05 * DefaultCellSize.X / CellMulX),
+    Trunc(0.05 * DefaultCellSize.Y / CellMulY)
+  );
 end;
 
@@ -413 +450 @@
 end;
 
+function TVoronoiMap.CalculatePixelRect: TRect;
+begin
+  Result := inherited CalculatePixelRect;
+  Result.P2 := Result.P2 + TPoint.Create(
+    Trunc(0.02 * DefaultCellSize.X),
+    Trunc(0.02 * DefaultCellSize.Y)
+  );
+end;
+
 { TTriangleMap }
 
@@ -447 +493 @@
     if Reverse then Rev := -1
       else Rev := 1;
-    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X * TriangleCellMulX),
-      Trunc((Y * DefaultCellSize.Y * TriangleCellMulY) - (0.1 * Rev * DefaultCellSize.Y)));
+    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X * CellMulX),
+      Trunc((Y * DefaultCellSize.Y * CellMulY) - (0.1 * Rev * DefaultCellSize.Y)));
     NewCell.Polygon := GetTrianglePolygon(NewCell.PosPx, DefaultCellSize, Reverse);
     NewCell.Id := GetNewCellId;
@@ -483 +529 @@
 end;
 
+function TTriangleMap.CalculatePixelRect: TRect;
+begin
+  Result := inherited CalculatePixelRect;
+  Result.P2 := Result.P2 + TPoint.Create(
+    Trunc(0.05 * DefaultCellSize.X / CellMulX - 0.30 * DefaultCellSize.X / CellMulX),
+    Trunc(0.05 * DefaultCellSize.Y / CellMulY)
+  );
+end;
+
 
 end.

trunk/UPlayer.pas

@@ -349 +349 @@
   I: Integer;
 begin
+  // TODO: Can it be optimized somehow?
   Result := nil;
   for I := 0 to Cells.Count - 1 do