Changeset 53 for trunk

Timestamp:

Aug 17, 2014, 3:00:30 PM (10 years ago)

Author:

chronos

Message:

• Modified: Drawing cells unified from THexMap and TSquareMap to generic TMap.Paint method.

File:

• trunk/UGame.pas (modified) (16 diffs)

trunk/UGame.pas

@@ -20 +20 @@
   TGame = class;
   TPlayer = class;
+  TView = class;
 
   TFloatPoint = record
@@ -44 +45 @@
     Neighbors: TObjectList; // TList<TCell>
     procedure Assign(Source: TCell);
+    function IsVisible(View: TView): Boolean;
     function GetColor: TColor;
     function GetAvialPower: Integer;
@@ -95 +97 @@
     Cells: TObjectList; // TList<TCell>
     procedure DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint; Angle: Double;
-      Size: TPoint; Text: string);
+      Text: string);
     function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean; virtual;
     function IsValidIndex(Index: TPoint): Boolean; virtual;
@@ -129 +131 @@
     function IsValidIndex(Index: TPoint): Boolean; override;
     function GetPixelRect: TRect; override;
-    procedure Paint(Canvas: TCanvas; View: TView); override;
     procedure Generate; override;
     constructor Create; override;
@@ -143 +144 @@
     function IsValidIndex(Index: TPoint): Boolean; override;
     function GetPixelRect: TRect; override;
-    procedure Paint(Canvas: TCanvas; View: TView); override;
     procedure Generate; override;
     constructor Create; override;
@@ -322 +322 @@
 end;
 
+function GetPolygonRect(Polygon: array of TPoint): TRect;
+var
+  I: Integer;
+begin
+  Result := Rect(High(Integer), High(Integer),
+    Low(Integer), Low(Integer));
+  for I := 0 to Length(Polygon) - 1 do
+  with Polygon[I] do begin
+    if X > Result.Right then
+      Result.Right := X;
+    if X < Result.Left then
+      Result.Left := X;
+    if Y > Result.Bottom then
+      Result.Bottom := Y;
+    if Y < Result.Top then
+      Result.Top := Y;
+  end;
+end;
+
 { TSquareMap }
 
@@ -382 +401 @@
 end;
 
-procedure TSquareMap.Paint(Canvas: TCanvas; View: TView);
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  CellSizeZoomed: TFloatPoint;
-  CellSize: TFloatPoint;
-  HexSize: TFloatPoint;
-  I: Integer;
-  Points: array of TPoint;
-  Cell: TCell;
-  PosFrom, PosTo: TPoint;
-  Angle: Double;
-begin
-  CellSize := FloatPoint(DefaultCellSize.X * SquareCellMulX, DefaultCellSize.Y * SquareCellMulY);
-  HexSize := FloatPoint(DefaultCellSize.X * View.Zoom, DefaultCellSize.Y * View.Zoom);
-  CellSizeZoomed := FloatPoint(CellSize.X * View.Zoom, CellSize.Y * View.Zoom);
-  with Canvas, View do try
-    Lock;
-    for CY := Trunc(SourceRect.Top / CellSize.Y) to Trunc(SourceRect.Bottom / CellSize.Y) + 1 do
-    for CX := Trunc(SourceRect.Left / CellSize.X) to Trunc(SourceRect.Right / CellSize.X) + 1 do begin
-      X := CX;
-      Y := CY;
-      if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then begin
-        Cell := TCell(Cells[CY * FSize.X + CX]);
-        if Cell.Terrain <> ttVoid then begin
-          if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY * FSize.X + CX])) then Brush.Color := clGreen
-            else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY * FSize.X + CX])) then Brush.Color := clPurple
-            else Brush.Color := Cell.GetColor;
-          Pen.Color := clBlack;
-          PaintCell(Canvas, Point(Trunc(X * CellSize.X),
-            Trunc(Y * CellSize.Y)),
-            IntToStr(Cell.GetAvialPower), View, TCell(Cells[CY * FSize.X + CX]));
-          // Draw arrows
-          Pen.Color := clCream;
-          for I := 0 to Cell.MovesFrom.Count - 1 do begin
-            PosFrom := CellToPos(Cell);
-            PosTo := CellToPos(TUnitMove(Cell.MovesFrom[I]).CellTo);
-            if TUnitMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
-              else Pen.Width := 1;
-            Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
-            if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-            DrawArrow(Canvas, View, View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 3),
-              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 3))),
-              Angle, Point(Trunc(HexSize.X / 4), Trunc(HexSize.Y / 4)),
-              IntToStr(TUnitMove(Cell.MovesFrom[I]).CountOnce));
-            Pen.Width := 1;
-          end;
-        end;
-      end;
-    end;
-  finally
-    Unlock;
-  end;
-end;
-
 constructor TSquareMap.Create;
 begin
@@ -463 +427 @@
 
 procedure TMap.DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint;
-  Angle: Double; Size: TPoint; Text: string);
+  Angle: Double; Text: string);
 var
   Points: array of TPoint;
   FPoints: array of TFloatPoint;
   I: Integer;
+  ArrowSize: TPoint;
 begin
   Canvas.Brush.Color := clWhite;
@@ -473 +438 @@
   SetLength(Points, 8);
   SetLength(FPoints, 8);
-  FPoints[0] := FloatPoint(+0.5 * Size.X, +0 * Size.Y);
-  FPoints[1] := FloatPoint(+0 * Size.X, +0.5 * Size.Y);
-  FPoints[2] := FloatPoint(+0 * Size.X, +0.25 * Size.Y);
-  FPoints[3] := FloatPoint(-0.5 * Size.X, +0.25 * Size.Y);
-  FPoints[4] := FloatPoint(-0.5 * Size.X, -0.25 * Size.Y);
-  FPoints[5] := FloatPoint(+0 * Size.X, -0.25 * Size.Y);
-  FPoints[6] := FloatPoint(+0 * Size.X, -0.5 * Size.Y);
-  FPoints[7] := FloatPoint(+0.5 * Size.X, 0 * Size.Y);
+  ArrowSize := Point(Trunc(DefaultCellSize.X / 4 * View.Zoom),
+    Trunc(DefaultCellSize.Y / 4* View.Zoom));
+  FPoints[0] := FloatPoint(+0.5 * ArrowSize.X, +0 * ArrowSize.Y);
+  FPoints[1] := FloatPoint(+0 * ArrowSize.X, +0.5 * ArrowSize.Y);
+  FPoints[2] := FloatPoint(+0 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  FPoints[3] := FloatPoint(-0.5 * ArrowSize.X, +0.25 * ArrowSize.Y);
+  FPoints[4] := FloatPoint(-0.5 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  FPoints[5] := FloatPoint(+0 * ArrowSize.X, -0.25 * ArrowSize.Y);
+  FPoints[6] := FloatPoint(+0 * ArrowSize.X, -0.5 * ArrowSize.Y);
+  FPoints[7] := FloatPoint(+0.5 * ArrowSize.X, 0 * ArrowSize.Y);
   // Rotate
   for I := 0 to Length(Points) - 1 do
-    FPoints[I] := FloatPoint(FPoints[I].X * cos(Angle) - FPoints[I].Y * sin(Angle),
-      FPoints[I].X * sin(Angle) + FPoints[I].Y * cos(Angle));
+    FPoints[I] := FloatPoint(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
@@ -520 +487 @@
 
   // Copy all cells
+  (*
   Cells.Count := 0;
   Cells.Count := Source.Cells.Count;
@@ -526 +494 @@
     TCell(Cells[I]).Assign(TCell(Source.Cells[I]));
   end;
+  *)
 end;
 
@@ -679 +648 @@
 end;
 
-procedure TMap.Paint(Canvas: TCanvas; View: TView);
-begin
-
-end;
-
 function TMap.GetPixelRect: TRect;
 var
@@ -773 +737 @@
 
 procedure TView.SetZoom(AValue: Double);
-var
-  OldSourceRect: TRect;
 begin
   if FZoom = AValue then Exit;
@@ -830 +792 @@
   Polygon := Source.Polygon;
   // TODO: How to copy neighbours and moves list
+end;
+
+function TCell.IsVisible(View: TView): Boolean;
+var
+  RectA, RectB: TRect;
+begin
+  RectA := GetPolygonRect(Polygon);
+  RectB := View.SourceRect;
+  Result := ((RectA.Left < RectB.Right) and (RectA.Right > RectB.Left) and
+    (RectA.Top < RectB.Bottom) and (RectA.Bottom > RectB.Top));
 end;
 
@@ -1505 +1477 @@
 end;
 
-procedure THexMap.Paint(Canvas: TCanvas; View: TView);
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  CellSizeZoomed: TFloatPoint;
-  CellSize: TFloatPoint;
-  HexSize: TFloatPoint;
-  I: Integer;
-  Points: array of TPoint;
+procedure TMap.Paint(Canvas: TCanvas; View: TView);
+var
+  I: Integer;
+  C: Integer;
   Cell: TCell;
   PosFrom, PosTo: TPoint;
@@ -1519 +1486 @@
   ArrowCenter: TPoint;
 begin
-  CellSize := FloatPoint(DefaultCellSize.X / HexCellMulX, DefaultCellSize.Y / HexCellMulY);
-  HexSize := FloatPoint(DefaultCellSize.X * View.Zoom, DefaultCellSize.Y * View.Zoom);
-  CellSizeZoomed := FloatPoint(CellSize.X * View.Zoom, CellSize.Y * View.Zoom);
   with Canvas, View do
   try
     Lock;
-    for CY := Trunc(SourceRect.Top / CellSize.Y) to Trunc(SourceRect.Bottom / CellSize.Y) + 1 do
-    for CX := Trunc(SourceRect.Left / CellSize.X) to Trunc(SourceRect.Right / CellSize.X) + 1 do begin
-      X := CX;
-      Y := CY;
-      if (CY and 1) = 1 then begin
-        X := X + 0.5;
-        //Y := Y + 0.5;
-      end;
-      if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then begin
-        Cell := TCell(Cells[CY * FSize.X + CX]);
-        if Cell.Terrain <> ttVoid then begin
-          if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY * FSize.X + CX])) then Brush.Color := clGreen
-            else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY * FSize.X + CX])) then Brush.Color := clPurple
-            else Brush.Color := Cell.GetColor;
-          Pen.Color := clBlack;
-          PaintCell(Canvas, Point(Trunc(X * CellSize.X),
-            Trunc(Y * CellSize.Y)),
-            IntToStr(Cell.GetAvialPower), View, TCell(Cells[CY * FSize.X + CX]));
-          // Draw arrows
-          Pen.Color := clCream;
-          for I := 0 to Cell.MovesFrom.Count - 1 do begin
-            PosFrom := CellToPos(Cell);
-            PosTo := CellToPos(TUnitMove(Cell.MovesFrom[I]).CellTo);
-            if TUnitMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
-              else Pen.Width := 1;
-            Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
-            if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-            ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 3),
-              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 3)));
-            DrawArrow(Canvas, View, ArrowCenter,
-              Angle, Point(Trunc(HexSize.X / 4), Trunc(HexSize.Y / 4)),
-              IntToStr(TUnitMove(Cell.MovesFrom[I]).CountOnce));
-          end;
+    for C := 0 to Cells.Count - 1 do begin
+      Cell := TCell(Cells[C]);
+      if (Cell.Terrain <> ttVoid) and Cell.IsVisible(View) then begin
+        if Assigned(SelectedCell) and (SelectedCell = Cell) then
+            Brush.Color := clGreen
+          else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, Cell) then
+            Brush.Color := clPurple
+          else Brush.Color := Cell.GetColor;
+        Pen.Color := clBlack;
+        PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
+
+        // Draw arrows
+        Pen.Color := clCream;
+        for I := 0 to Cell.MovesFrom.Count - 1 do begin
+          PosFrom := CellToPos(Cell);
+          PosTo := CellToPos(TUnitMove(Cell.MovesFrom[I]).CellTo);
+          if TUnitMove(Cell.MovesFrom[I]).CountRepeat > 0 then Pen.Width := 2
+            else Pen.Width := 1;
+          Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
+          if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
+          ArrowCenter := View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 3),
+            Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 3)));
+          DrawArrow(Canvas, View, ArrowCenter,
+            Angle, IntToStr(TUnitMove(Cell.MovesFrom[I]).CountOnce));
         end;
       end;