Changeset 55 for trunk/UGame.pas

Timestamp:

Aug 18, 2014, 9:34:15 AM (10 years ago)

Author:

chronos

Message:

• Fixed: More translation of TGroupBox and TComboBox items.
• Fixed: Shape of hexagon was not regular due to rounding error in polygon generation and drawing. Cells are now generated internally as bigger to avoid rounding error.
• Fixed: After game end do not allow to execute End turn and End game actions.
• Added: Preparation for random voronoi map. So far hidden in developer mode as algorithm is missing.

File:

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

trunk/UGame.pas

@@ -92 +92 @@
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
       Cell: TCell);
+    procedure DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint; Angle: Double;
+      Text: string);
     procedure SetSize(AValue: TPoint); virtual;
   public
@@ -98 +100 @@
     DefaultCellSize: TPoint;
     Cells: TObjectList; // TList<TCell>
-    procedure DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint; Angle: Double;
-      Text: string);
     function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean; virtual;
     function IsValidIndex(Index: TPoint): Boolean; virtual;
@@ -151 +151 @@
   public
     function IsValidIndex(Index: TPoint): Boolean; override;
+    procedure Generate; override;
+  end;
+
+  { TVoronoiMap }
+
+  TVoronoiMap = class(TMap)
+  private
+    function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPointArray;
+  public
     procedure Generate; override;
   end;
@@ -210 +219 @@
   TGrowAmount = (gaByOne, gaBySquareRoot);
   TGrowCells = (gcNone, gcPlayerCities, gcPlayerAll);
-  TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle);
+  TMapType = (mtNone, mtHexagon, mtSquare, mtTriangle, mtVoronoi);
   TWinObjective = (woDefeatAllOponents, woDefeatAllOponentsCities,
     woSpecialCaptureCell, woStayAliveForDefinedTurns);
@@ -345 +354 @@
 end;
 
+{ TVoronoiMap }
+
+function TVoronoiMap.GetTrianglePolygon(Pos: TPoint; Size: TPoint;
+  Reverse: Boolean): TPointArray;
+begin
+
+end;
+
+procedure TVoronoiMap.Generate;
+var
+  X, Y: Integer;
+  I, J, PI: Integer;
+  V, VN: Integer;
+  NewCell: TCell;
+  Pos: TPoint;
+begin
+  inherited;
+  // Free previous
+  Cells.Count := 0;
+  // Allocate and init new
+  Cells.Count := FSize.Y * FSize.X;
+  for Y := 0 to FSize.Y - 1 do
+  for X := 0 to FSize.X - 1 do begin
+    NewCell := TCell.Create;
+    NewCell.PosPx := Point(Trunc(Random * FSize.X * DefaultCellSize.X), Trunc(Random * FSize.Y * DefaultCellSize.Y));
+    SetLength(NewCell.Polygon, 1);
+    NewCell.Polygon[0] := NewCell.PosPx;
+    Cells[Y * FSize.X + X] := NewCell;
+  end;
+end;
+
 { TTriangleMap }
 
@@ -503 +543 @@
     Brush.Style := bsClear;
     Font.Color := clBlack;
-    Font.Size := Trunc(4 * View.Zoom);
+    Font.Size := Trunc(16 * View.Zoom);
     TextOut(Pos.X - TextWidth(Text) div 2,
       Pos.Y - TextHeight(Text) div 2, Text);
@@ -624 +664 @@
     Pen.Style := psSolid;
     Font.Color := clWhite;
-    Font.Size := Trunc(12 * View.Zoom);
+    Font.Size := Trunc(42 * View.Zoom);
     TextPos := View.CellToCanvasPos(Pos);
     TextOut(Round(TextPos.X) - TextWidth(Text) div 2, Round(TextPos.Y) - TextHeight(Text) div 2, Text);
@@ -668 +708 @@
 begin
   MaxPower := 99;
-  DefaultCellSize := Point(62, 62);
+  DefaultCellSize := Point(220, 220);
   Cells := TObjectList.create;
   Size := Point(0, 0);
@@ -1128 +1168 @@
     mtSquare: Map := TSquareMap.Create;
     mtTriangle: Map := TTriangleMap.Create;
+    mtVoronoi: Map := TVoronoiMap.Create;
     else Map := TMap.Create;
   end;
@@ -1432 +1473 @@
   Shift := FloatPoint(0.5 * cos(30 / 180 * Pi), 0.5 * sin(30 / 180 * Pi));
   SetLength(Result, 6);
-  Result[0] := Point(Round(Pos.X + 0 * Size.X), Round(Pos.Y - 0.5 * Size.Y));
-  Result[1] := Point(Round(Pos.X + Shift.X * Size.X), Round(Pos.Y - Shift.Y * Size.Y));
-  Result[2] := Point(Round(Pos.X + Shift.X * Size.X), Round(Pos.Y + Shift.Y * Size.Y));
-  Result[3] := Point(Round(Pos.X + 0 * Size.X), Round(Pos.Y + 0.5 * Size.Y));
-  Result[4] := Point(Round(Pos.X - Shift.X * Size.X), Round(Pos.Y + Shift.Y * Size.Y));
-  Result[5] := Point(Round(Pos.X - Shift.X * Size.X), Round(Pos.Y - Shift.Y * Size.Y));
+  Result[0] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y - 0.5 * Size.Y));
+  Result[1] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
+  Result[2] := Point(Trunc(Pos.X + Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
+  Result[3] := Point(Trunc(Pos.X + 0 * Size.X), Trunc(Pos.Y + 0.5 * Size.Y));
+  Result[4] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y + Shift.Y * Size.Y));
+  Result[5] := Point(Trunc(Pos.X - Shift.X * Size.X), Trunc(Pos.Y - Shift.Y * Size.Y));
 end;