Changeset 48

Timestamp:

Aug 17, 2014, 11:58:58 AM (10 years ago)

Author:

chronos

Message:

• Modified: Two dimenzional Size map parameter moved to TMap base class. It will be converted to pixel size to support different mesh types.

File:

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

trunk/UGame.pas

@@ -82 +82 @@
   TMap = class
   private
+    FSize: TPoint;
     function GetSize: TPoint; virtual;
     procedure SetSize(AValue: TPoint); virtual;
@@ -114 +115 @@
   THexMap = class(TMap)
   private
-    FSize: TPoint;
-    function GetSize: TPoint; override;
-    procedure SetSize(AValue: TPoint); override;
     function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
     function GetCellNeighbors2(Cell: TCell): TCellArray;
@@ -140 +138 @@
   TSquareMap = class(TMap)
   private
-    FSize: TPoint;
-    function GetSize: TPoint; override;
-    procedure SetSize(AValue: TPoint); override;
     function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
-    function GetCellNeighbours2(Cell: TCell): TCellArray;
+    function GetCellNeighbors2(Cell: TCell): TCellArray;
   public
     Cells: array of array of TCell;
+    procedure Generate; override;
     function IsValidIndex(Index: TPoint): Boolean; override;
     function PosToCell(Pos: TPoint; View: TView): TCell; override;
@@ -155 +151 @@
     constructor Create; override;
     destructor Destroy; override;
-    property Size: TPoint read FSize write SetSize;
   end;
 
@@ -333 +328 @@
 { TSquareMap }
 
-function TSquareMap.GetSize: TPoint;
-begin
-  Result := FSize;
-end;
-
-procedure TSquareMap.SetSize(AValue: TPoint);
+procedure TSquareMap.Generate;
 var
   X, Y: Integer;
+  I: 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;
+  NeighCells: TCellArray;
+begin
+  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;
+  // 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;
@@ -430 +426 @@
 end;
 
-function TSquareMap.GetCellNeighbours2(Cell: TCell): TCellArray;
+function TSquareMap.GetCellNeighbors2(Cell: TCell): TCellArray;
 var
   X, Y: Integer;
@@ -564 +560 @@
 function TMap.GetSize: TPoint;
 begin
-  Result:= Point(0, 0);
+  Result:= FSize;
 end;
 
 procedure TMap.SetSize(AValue: TPoint);
 begin
-
+  if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
+    FSize := AValue;
+    Generate;
+  end;
 end;
 
@@ -1451 +1450 @@
 end;
 
-function THexMap.GetSize: TPoint;
-begin
-  Result := FSize;
-end;
-
-procedure THexMap.SetSize(AValue: TPoint);
-begin
-  if (FSize.X <> AValue.X) or (FSize.Y <> AValue.Y) then begin
-    FSize := AValue;
-    Generate;
-  end;
-end;
-
 function THexMap.IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
 var
@@ -1696 +1682 @@
   NeighCells: TCellArray;
 begin
+  inherited;
   // Free previous
   for Y := 0 to Length(Cells) - 1 do
@@ -1721 +1708 @@
 begin
   inherited;
+  FSize := Point(0, 0);
 end;