Changeset 47 for trunk/UGame.pas

Timestamp:

Aug 17, 2014, 2:02:43 AM (10 years ago)

Author:

chronos

Message:

• Modified: Cell neightbors list is now attached to each cell as it will not be possible to easily calucalte it for generic mesh. Neighbour relation will be generated during map generation.

File:

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

trunk/UGame.pas

@@ -41 +41 @@
     MovesFrom: TObjectList; // TList<TMove>
     MovesTo: TObjectList; // TList<TMove>
+    Neighbors: TObjectList; // TList<TCell>
     function GetColor: TColor;
     function GetAvialPower: Integer;
@@ -98 +99 @@
     procedure Grow(APlayer: TPlayer); virtual;
     procedure ComputePlayerStats; virtual;
+    procedure Generate; virtual;
     constructor Create; virtual;
     destructor Destroy; override;
-    function GetCellNeighbours(Cell: TCell): TCellArray; virtual;
+    function GetCellNeighbors(Cell: TCell): TCellArray; virtual;
     procedure Paint(Canvas: TCanvas; View: TView); virtual;
     function GetPixelRect: TRect; virtual;
@@ -115 +117 @@
     function GetSize: TPoint; override;
     procedure SetSize(AValue: TPoint); override;
+    function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
+    function GetCellNeighbors2(Cell: TCell): TCellArray;
   public
     Cells: array of array of TCell;
-    function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean; override;
-    procedure Assign(Source: TMap); virtual;
+    procedure Assign(Source: TMap); override;
     procedure LoadFromFile(FileName: string); override;
     procedure SaveToFile(FileName: string); override;
     function IsValidIndex(Index: TPoint): Boolean; override;
-    function GetCellNeighbours(Cell: TCell): TCellArray; override;
     function PosToCell(Pos: TPoint; View: TView): TCell; override;
     function CellToPos(Cell: TCell): TPoint; override;
     function GetHexagonPolygon(Pos: TPoint; HexSize: TPoint): TPointArray;
     procedure Paint(Canvas: TCanvas; View: TView); override;
+    procedure Generate; override;
     constructor Create; override;
     destructor Destroy; override;
@@ -140 +143 @@
     function GetSize: TPoint; override;
     procedure SetSize(AValue: TPoint); override;
+    function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
+    function GetCellNeighbours2(Cell: TCell): TCellArray;
   public
     Cells: array of array of TCell;
-    function IsCellsNeighbor(Cell1, Cell2: TCell): Boolean; override;
     function IsValidIndex(Index: TPoint): Boolean; override;
     function PosToCell(Pos: TPoint; View: TView): TCell; override;
     function CellToPos(Cell: TCell): TPoint; override;
-    function GetCellNeighbours(Cell: TCell): TCellArray; override;
     function GetAllCells: TCellArray; override;
     function GetPixelRect: TRect; override;
@@ -359 +362 @@
 end;
 
-function TSquareMap.IsCellsNeighbor(Cell1, Cell2: TCell): Boolean;
+function TSquareMap.IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
 var
   DX: Integer;
@@ -427 +430 @@
 end;
 
-function TSquareMap.GetCellNeighbours(Cell: TCell): TCellArray;
+function TSquareMap.GetCellNeighbours2(Cell: TCell): TCellArray;
 var
   X, Y: Integer;
@@ -435 +438 @@
   for X := -1 to 1 do
   if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  IsCellsNeighbor(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
+  IsCellsNeighbor2(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
     SetLength(Result, Length(Result) + 1);
     Result[Length(Result) - 1] := Cells[Cell.Pos.Y + Y, Cell.Pos.X + X];
@@ -608 +611 @@
 function TMap.IsCellsNeighbor(Cell1, Cell2: TCell): Boolean;
 begin
-  Result := False;
+  Result := Cell1.Neighbors.IndexOf(Cell2) <> -1;
 end;
 
@@ -683 +686 @@
 end;
 
+procedure TMap.Generate;
+begin
+end;
+
 constructor TMap.Create;
 begin
@@ -695 +702 @@
 end;
 
-function TMap.GetCellNeighbours(Cell: TCell): TCellArray;
-begin
-
+function TMap.GetCellNeighbors(Cell: TCell): TCellArray;
+var
+  I: Integer;
+begin
+  SetLength(Result, Cell.Neighbors.Count);
+  for I := 0 to Length(Result) - 1 do
+    Result[I] := TCell(Cell.Neighbors[I]);
 end;
 
@@ -729 +740 @@
 function TMap.GetAllCells: TCellArray;
 begin
-
+  SetLength(Result, 0);
 end;
 
@@ -861 +872 @@
 begin
   Player := nil;
+  Neighbors := TObjectList.Create;
+  Neighbors.OwnsObjects := False;
   MovesFrom := TObjectList.Create;
   MovesFrom.OwnsObjects := False;
@@ -877 +890 @@
     TUnitMove(MovesTo[I]).Free;
   FreeAndNil(MovesTo);
+  FreeAndNil(Neighbors);
   inherited Destroy;
 end;
@@ -940 +954 @@
       // Attack to not owned cell yet
       // Count own possible power
-      Cells := Game.Map.GetCellNeighbours(AllCells[C]);
+      Cells := Game.Map.GetCellNeighbors(AllCells[C]);
       TotalPower := 0;
       for I := 0 to Length(Cells) - 1 do
@@ -964 +978 @@
       // We need to move available power to borders to be available for attacks
       // or defense
-      Cells := Game.Map.GetCellNeighbours(AllCells[C]);
+      Cells := Game.Map.GetCellNeighbors(AllCells[C]);
       CanAttack := 0;
       for I := 0 to Length(Cells) - 1 do
@@ -1125 +1139 @@
     mtHexagon: Map := THexMap.Create;
     mtSquare: Map := TSquareMap.Create;
+    else Map := TMap.Create;
   end;
   Map.Assign(OldMap);
@@ -1141 +1156 @@
 begin
   I := 0;
+  Confirm := True;
   while (I < Moves.Count) and ((TUnitMove(Moves[I]).CellFrom <> CellFrom) or
     (TUnitMove(Moves[I]).CellTo <> CellTo)) do Inc(I);
@@ -1225 +1241 @@
 
 procedure TGame.LoadConfig(Config: TXmlConfig; Path: string);
+var
+  P: TPoint;
 begin
   with Config do begin
@@ -1439 +1457 @@
 
 procedure THexMap.SetSize(AValue: TPoint);
-var
-  X, Y: Integer;
-  NewCell: TCell;
-  C: Integer;
 begin
   if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
-    // Free previous
-    for Y := 0 to FSize.Y - 1 do
-    for X := 0 to FSize.X - 1 do begin
-      TCell(Cells[Y, X]).Destroy;
-    end;
     FSize := AValue;
-    // Allocate and init new
-    SetLength(Cells, 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.Pos := Point(X, Y);
-      Cells[Y, X] := NewCell;
-    end;
-  end;
-end;
-
-function THexMap.IsCellsNeighbor(Cell1, Cell2: TCell): Boolean;
+    Generate;
+  end;
+end;
+
+function THexMap.IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
 var
   DX: Integer;
@@ -1484 +1486 @@
 procedure THexMap.Assign(Source: TMap);
 begin
+  inherited;
 end;
 
@@ -1522 +1525 @@
 end;
 
-function THexMap.GetCellNeighbours(Cell: TCell): TCellArray;
+function THexMap.GetCellNeighbors2(Cell: TCell): TCellArray;
 var
   X, Y: Integer;
@@ -1530 +1533 @@
   for X := -1 to 1 do
   if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  IsCellsNeighbor(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
+  IsCellsNeighbor2(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
     SetLength(Result, Length(Result) + 1);
     Result[Length(Result) - 1] := Cells[Cell.Pos.Y + Y, Cell.Pos.X + X];
@@ -1686 +1689 @@
 end;
 
+procedure THexMap.Generate;
+var
+  X, Y: Integer;
+  I: Integer;
+  NewCell: TCell;
+  NeighCells: TCellArray;
+begin
+  // Free previous
+  for Y := 0 to Length(Cells) - 1 do
+  for X := 0 to Length(Cells[Y]) - 1 do begin
+    TCell(Cells[Y, X]).Destroy;
+  end;
+  // Allocate and init new
+  SetLength(Cells, 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.Pos := Point(X, Y);
+    Cells[Y, X] := NewCell;
+  end;
+  // Generate neightbours
+  for Y := 0 to FSize.Y - 1 do
+  for X := 0 to FSize.X - 1 do begin
+    NeighCells := GetCellNeighbors2(Cells[Y, X]);
+    for I := 0 to Length(NeighCells) - 1 do
+      Cells[Y, X].Neighbors.Add(NeighCells[I]);
+  end;
+end;
+
 constructor THexMap.Create;
 begin