Changeset 49

Timestamp:

Aug 17, 2014, 12:14:10 PM (10 years ago)

Author:

chronos

Message:

• Modified: Cells moved to base Map class as it will be no longer 2D array. Not it is simple list to support diferent mesh type and different map shape.

File:

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

trunk/UGame.pas

@@ -89 +89 @@
     MaxPower: Integer;
     DefaultCellSize: TPoint;
+    Cells: TObjectList; // TList<TCell>
     procedure DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint; Angle: Double;
       Size: TPoint; Text: string);
@@ -118 +119 @@
     function GetCellNeighbors2(Cell: TCell): TCellArray;
   public
-    Cells: array of array of TCell;
     procedure Assign(Source: TMap); override;
     procedure LoadFromFile(FileName: string); override;
@@ -141 +141 @@
     function GetCellNeighbors2(Cell: TCell): TCellArray;
   public
-    Cells: array of array of TCell;
     procedure Generate; override;
     function IsValidIndex(Index: TPoint): Boolean; override;
@@ -337 +336 @@
   inherited;
   // 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;
+  Cells.Count := 0;
   // Allocate and init new
-  SetLength(Cells, FSize.Y, FSize.X);
+  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.Pos := Point(X, Y);
-    Cells[Y, X] := NewCell;
+    Cells[Y * FSize.X + 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]);
+    NeighCells := GetCellNeighbors2(TCell(Cells[Y * FSize.X + X]));
     for I := 0 to Length(NeighCells) - 1 do
-      Cells[Y, X].Neighbors.Add(NeighCells[I]);
+      TCell(Cells[Y * FSize.X + X]).Neighbors.Add(NeighCells[I]);
   end;
 end;
@@ -396 +392 @@
       Y := CY;
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then
-      if Cells[CY, CX].Terrain <> ttVoid then begin
+      if TCell(Cells[CY * FSize.X + CX]).Terrain <> ttVoid then begin
         Frame := Rect(Trunc(X * CellSize.X - HexSize.X / 2),
           Trunc(Y * CellSize.Y - HexSize.Y / 2),
@@ -402 +398 @@
           Trunc(Y * CellSize.Y + HexSize.Y / 2));
         if PtInRect(Frame, Pos) then begin
-          Result := Cells[CY, CX];
+          Result := TCell(Cells[CY * FSize.X + CX]);
           Exit;
         end;
@@ -434 +430 @@
   for X := -1 to 1 do
   if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  IsCellsNeighbor2(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
+  IsCellsNeighbor2(Cell, TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)])) then begin
     SetLength(Result, Length(Result) + 1);
-    Result[Length(Result) - 1] := Cells[Cell.Pos.Y + Y, Cell.Pos.X + X];
+    Result[Length(Result) - 1] := TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)]);
   end;
 end;
@@ -449 +445 @@
   for Y := 0 to Size.Y - 1 do
   for X := 0 to Size.X - 1 do
-    Result[Y * Size.X + X] := Cells[Y, X];
+    Result[Y * Size.X + X] := TCell(Cells[Y * FSize.X + X]);
 end;
 
@@ -476 +472 @@
 begin
   with Canvas do begin
-    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY, CX])) then begin
+    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY * FSize.X + CX])) then begin
       Pen.Color := clYellow;
       Pen.Style := psSolid;
       Pen.Width := 1;
     end else
-    if TCell(Cells[CY, CX]).Terrain = ttCity then begin
+    if TCell(Cells[CY * FSize.X + CX]).Terrain = ttCity then begin
       // Cannot set clear border as it will display shifted on gtk2
       //Pen.Style := psClear;
@@ -514 +510 @@
       Y := CY;
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then begin
-        Cell := Cells[CY, CX];
+        Cell := TCell(Cells[CY * FSize.X + CX]);
         if Cell.Terrain <> ttVoid then begin
-          if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY, CX])) then Brush.Color := clGreen
-            else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY, CX])) then Brush.Color := clPurple
+          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;
@@ -686 +682 @@
 
 procedure TMap.Generate;
-begin
+var
+  X, Y: Integer;
+  I: Integer;
+  NewCell: TCell;
+  NeighCells: TCellArray;
+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.Pos := Point(X, Y);
+    Cells[Y * FSize.X + X] := NewCell;
+  end;
 end;
 
@@ -693 +705 @@
   MaxPower := 99;
   DefaultCellSize := Point(62, 62);
+  Cells := TObjectList.create;
 end;
 
@@ -698 +711 @@
 begin
   Size := Point(0, 0);
+  FreeAndNil(Cells);
   inherited Destroy;
 end;
@@ -1519 +1533 @@
   for X := -1 to 1 do
   if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  IsCellsNeighbor2(Cell, Cells[Cell.Pos.Y + Y, Cell.Pos.X + X]) then begin
+  IsCellsNeighbor2(Cell, TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)])) then begin
     SetLength(Result, Length(Result) + 1);
-    Result[Length(Result) - 1] := Cells[Cell.Pos.Y + Y, Cell.Pos.X + X];
+    Result[Length(Result) - 1] := TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)]);
   end;
 end;
@@ -1547 +1561 @@
       end;
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then
-      if Cells[CY, CX].Terrain <> ttVoid then begin
+      if TCell(Cells[CY * FSize.X + CX]).Terrain <> ttVoid then begin
         Points := GetHexagonPolygon(Point(Trunc(X * CellSize.X),
           Trunc(Y * CellSize.Y)),
           Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
         if PtInPoly(Points, Pos) then begin
-          Result := Cells[CY, CX];
+          Result := TCell(Cells[CY * FSize.X + CX]);
           Exit;
         end;
@@ -1599 +1613 @@
 begin
   with Canvas do begin
-    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY, CX])) then begin
+    if Assigned(View.FocusedCell) and (View.FocusedCell = TCell(Cells[CY * FSize.X + CX])) then begin
       Pen.Color := clYellow;
       Pen.Style := psSolid;
       Pen.Width := 1;
     end else
-    if TCell(Cells[CY, CX]).Terrain = ttCity then begin
+    if TCell(Cells[CY * FSize.X + CX]).Terrain = ttCity then begin
       // Cannot set clear border as it will display shifted on gtk2
       //Pen.Style := psClear;
@@ -1643 +1657 @@
       end;
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then begin
-        Cell := Cells[CY, CX];
+        Cell := TCell(Cells[CY * FSize.X + CX]);
         if Cell.Terrain <> ttVoid then begin
-          if Assigned(SelectedCell) and (SelectedCell = TCell(Cells[CY, CX])) then Brush.Color := clGreen
-            else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, TCell(Cells[CY, CX])) then Brush.Color := clPurple
+          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;
@@ -1684 +1698 @@
   inherited;
   // 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;
+  Cells.Count := 0;
   // Allocate and init new
-  SetLength(Cells, FSize.Y, FSize.X);
+  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.Pos := Point(X, Y);
-    Cells[Y, X] := NewCell;
+    Cells[Y * FSize.X + 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]);
+    NeighCells := GetCellNeighbors2(TCell(Cells[Y * FSize.X + X]));
     for I := 0 to Length(NeighCells) - 1 do
-      Cells[Y, X].Neighbors.Add(NeighCells[I]);
+      TCell(Cells[Y * FSize.X + X]).Neighbors.Add(NeighCells[I]);
   end;
 end;
@@ -1725 +1736 @@
   for Y := 0 to Size.Y - 1 do
   for X := 0 to Size.X - 1 do
-    Result[Y * Size.X + X] := Cells[Y, X];
+    Result[Y * Size.X + X] := TCell(Cells[Y * FSize.X + X]);
 end;