Changeset 52 for trunk

Timestamp:

Aug 17, 2014, 2:10:09 PM (10 years ago)

Author:

chronos

Message:

• Modified: Cell Pos which was index in 2D array was changed to PosPx which is 2D pixel position in map.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• UGame.pas (modified) (19 diffs)

trunk/Forms/UFormMain.pas

@@ -299 +299 @@
     if Assigned(Cell) then begin
       Core.Game.CurrentPlayer.View.FocusedCell := Cell;
-      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) +
+      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.PosPx.X) + ', ' + IntToStr(Cell.PosPx.Y) +
         '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ')';
     end else begin

trunk/UGame.pas

@@ -36 +36 @@
     procedure SetPower(AValue: Integer);
   public
-    Pos: TPoint;
+    PosPx: TPoint;
     Polygon: TPointArray;
     Terrain: TTerrainType;
@@ -43 +43 @@
     MovesTo: TObjectList; // TList<TMove>
     Neighbors: TObjectList; // TList<TCell>
+    procedure Assign(Source: TCell);
     function GetColor: TColor;
     function GetAvialPower: Integer;
@@ -119 +120 @@
   THexMap = class(TMap)
   private
-    function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
-    function GetCellNeighbors2(Cell: TCell): TCellArray;
+    function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
+    function GetCellPosNeighbors(CellPos: TPoint): TCellArray;
     function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
   public
@@ -127 +128 @@
     procedure SaveToFile(FileName: string); override;
     function IsValidIndex(Index: TPoint): Boolean; override;
-    function PosToCell(Pos: TPoint; View: TView): TCell; override;
-    function CellToPos(Cell: TCell): TPoint; override;
     function GetPixelRect: TRect; override;
     procedure Paint(Canvas: TCanvas; View: TView); override;
@@ -140 +139 @@
   TSquareMap = class(TMap)
   private
-    function IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
-    function GetCellNeighbors2(Cell: TCell): TCellArray;
     function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPointArray;
   public
     function IsValidIndex(Index: TPoint): Boolean; override;
-    function PosToCell(Pos: TPoint; View: TView): TCell; override;
-    function CellToPos(Cell: TCell): TPoint; override;
     function GetPixelRect: TRect; override;
     procedure Paint(Canvas: TCanvas; View: TView); override;
@@ -344 +339 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
-    NewCell.Pos := Point(X, Y);
+    NewCell.PosPx := Point(Trunc(X * DefaultCellSize.X * SquareCellMulX),
+      Trunc(Y * DefaultCellSize.Y * SquareCellMulY));
+    NewCell.Polygon := GetSquarePolygon(NewCell.PosPx, DefaultCellSize);
     Cells[Y * FSize.X + X] := NewCell;
   end;
-  // Generate neightbours
+  // Generate neighbours
   for Y := 0 to FSize.Y - 1 do
   for X := 0 to FSize.X - 1 do
   with TCell(Cells[Y * FSize.X + X]) do begin
-    NeighCells := GetCellNeighbors2(TCell(Cells[Y * FSize.X + X]));
-    for I := 0 to Length(NeighCells) - 1 do
-      Neighbors.Add(NeighCells[I]);
-    Polygon := GetSquarePolygon(Point(Trunc(X * DefaultCellSize.X * SquareCellMulX),
-      Trunc(Y * DefaultCellSize.Y * SquareCellMulY)), DefaultCellSize);
-  end;
-end;
-
-function TSquareMap.IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
-var
-  DX: Integer;
-  DY: Integer;
-  MinY: Integer;
-begin
-  if Cell1.Pos.Y < Cell2.Pos.Y then MinY:= Cell1.Pos.Y
-    else MinY := Cell2.Pos.Y;
-  DX := Cell2.Pos.X - Cell1.Pos.X;
-  DY := Cell2.Pos.Y - Cell1.Pos.Y;
-  Result := (Abs(DX) <= 1) and (Abs(DY) <= 1);
-  Result := Result and not (Cell1 = Cell2);
+    if IsValidIndex(Point(Y + 0, X + 1)) then
+      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X + 1)]));
+    if IsValidIndex(Point(Y + 1, X + 0)) then
+      Neighbors.Add(TCell(Cells[(Y + 1) * FSize.X + (X + 0)]));
+    if IsValidIndex(Point(Y + 0, X - 1)) then
+      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X - 1)]));
+    if IsValidIndex(Point(Y - 1, X + 0)) then
+      Neighbors.Add(TCell(Cells[(Y - 1) * FSize.X + (X + 0)]));
+  end;
 end;
 
@@ -377 +363 @@
   Result := (Index.X >= 0) and (Index.X < Size.X) and
     (Index.Y >= 0) and (Index.Y < Size.Y);
-end;
-
-function TSquareMap.PosToCell(Pos: TPoint; View: TView): TCell;
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  HexSize: TFloatPoint;
-  CellSize: TFloatPoint;
-  Frame: TRect;
-begin
-  // TODO: This is implemented as simple sequence lookup. Needs some faster algorithm
-  Result := nil;
-  CellSize := FloatPoint(DefaultCellSize.X * SquareCellMulX, DefaultCellSize.Y * SquareCellMulX);
-  HexSize := FloatPoint(DefaultCellSize.X, DefaultCellSize.Y);
-  with View do
-    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
-      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),
-          Trunc(X * CellSize.X + HexSize.X / 2),
-          Trunc(Y * CellSize.Y + HexSize.Y / 2));
-        if PtInRect(Frame, Pos) then begin
-          Result := TCell(Cells[CY * FSize.X + CX]);
-          Exit;
-        end;
-      end;
-    end;
-end;
-
-function TSquareMap.CellToPos(Cell: TCell): TPoint;
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  HexSize: TFloatPoint;
-  CellSize: TFloatPoint;
-  Points: array of TPoint;
-begin
-  CellSize := FloatPoint(DefaultCellSize.X * SquareCellMulX, DefaultCellSize.Y * SquareCellMulX);
-  HexSize := FloatPoint(DefaultCellSize.X, DefaultCellSize.Y);
-  X := Cell.Pos.X;
-  Y := Cell.Pos.Y;
-
-  Result.X := Trunc(X * CellSize.X);
-  Result.Y := Trunc(Y * CellSize.Y);
-end;
-
-function TSquareMap.GetCellNeighbors2(Cell: TCell): TCellArray;
-var
-  X, Y: Integer;
-begin
-  SetLength(Result, 0);
-  for Y := -1 to 1 do
-  for X := -1 to 1 do
-  if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  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] := TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)]);
-  end;
 end;
 
@@ -586 +510 @@
 
 procedure TMap.Assign(Source: TMap);
+var
+  I: Integer;
 begin
   MaxPower := Source.MaxPower;
@@ -591 +517 @@
   Size := Source.Size;
   DefaultCellSize := Source.DefaultCellSize;
+  FSize := Source.Size;
+
+  // Copy all cells
+  Cells.Count := 0;
+  Cells.Count := Source.Cells.Count;
+  for I := 0 to Cells.Count - 1 do begin
+    Cells[I] := TCell.Create;
+    TCell(Cells[I]).Assign(TCell(Source.Cells[I]));
+  end;
 end;
 
@@ -604 +539 @@
 
 function TMap.PosToCell(Pos: TPoint; View: TView): TCell;
+var
+  I: Integer;
 begin
   Result := nil;
+  for I := 0 to Cells.Count - 1 do
+  if TCell(Cells[I]).Terrain <> ttVoid then begin
+    if PtInPoly(TCell(Cells[I]).Polygon, Pos) then begin
+      Result := TCell(Cells[I]);
+      Exit;
+    end;
+  end;
 end;
 
 function TMap.CellToPos(Cell: TCell): TPoint;
 begin
-  Result := Point(0, 0);
+  Result := Cell.PosPx;
 end;
 
@@ -707 +651 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
-    NewCell.Pos := Point(X, Y);
+    NewCell.PosPx := Point(X, Y);
     Cells[Y * FSize.X + X] := NewCell;
   end;
@@ -878 +822 @@
     raise Exception.Create('Not allowed to substract power under zero do negative value');
   FPower := AValue;
+end;
+
+procedure TCell.Assign(Source: TCell);
+begin
+  PosPx := Source.PosPx;
+  Terrain := Source.Terrain;
+  Polygon := Source.Polygon;
+  // TODO: How to copy neighbours and moves list
 end;
 
@@ -1478 +1430 @@
 end;
 
-function THexMap.IsCellsNeighbor2(Cell1, Cell2: TCell): Boolean;
+function THexMap.IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
 var
   DX: Integer;
@@ -1484 +1436 @@
   MinY: Integer;
 begin
-  if Cell1.Pos.Y < Cell2.Pos.Y then MinY:= Cell1.Pos.Y
-    else MinY := Cell2.Pos.Y;
-  DX := Cell2.Pos.X - Cell1.Pos.X;
-  DY := Cell2.Pos.Y - Cell1.Pos.Y;
+  if CellPos1.Y < CellPos2.Y then MinY:= CellPos1.Y
+    else MinY := CellPos2.Y;
+  DX := CellPos2.X - CellPos1.X;
+  DY := CellPos2.Y - CellPos1.Y;
   Result := (Abs(DX) <= 1) and (Abs(DY) <= 1) and
   ((((MinY mod 2) = 1) and
@@ -1495 +1447 @@
     not ((DX = -1) and (DY = -1)) and
     not ((DX = 1) and (DY = 1))));
-  Result := Result and not (Cell1 = Cell2);
+  Result := Result and not ((CellPos1.X = CellPos2.X) and (CellPos1.Y = CellPos2.Y));
 end;
 
@@ -1539 +1491 @@
 end;
 
-function THexMap.GetCellNeighbors2(Cell: TCell): TCellArray;
+function THexMap.GetCellPosNeighbors(CellPos: TPoint): TCellArray;
 var
   X, Y: Integer;
@@ -1546 +1498 @@
   for Y := -1 to 1 do
   for X := -1 to 1 do
-  if IsValidIndex(Point(Cell.Pos.X + X, Cell.Pos.Y + Y)) and
-  IsCellsNeighbor2(Cell, TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)])) then begin
+  if IsValidIndex(Point(CellPos.X + X, CellPos.Y + Y)) and
+  IsCellsPosNeighbor(CellPos, Point((CellPos.X + X), (CellPos.Y + Y))) then begin
     SetLength(Result, Length(Result) + 1);
-    Result[Length(Result) - 1] := TCell(Cells[(Cell.Pos.Y + Y) * FSize.X + (Cell.Pos.X + X)]);
-  end;
-end;
-
-function THexMap.PosToCell(Pos: TPoint; View: TView): TCell;
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  HexSize: TFloatPoint;
-  CellSize: TFloatPoint;
-begin
-  // TODO: This is implemented as simple sequence lookup. Needs some faster algorithm
-  Result := nil;
-  CellSize := FloatPoint(DefaultCellSize.X / HexCellMulX, DefaultCellSize.Y / HexCellMulY);
-  HexSize := FloatPoint(DefaultCellSize.X, DefaultCellSize.Y);
-  with View do
-    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
-      if TCell(Cells[CY * FSize.X + CX]).Terrain <> ttVoid then begin
-        if PtInPoly(TCell(Cells[CY * FSize.X + CX]).Polygon, Pos) then begin
-          Result := TCell(Cells[CY * FSize.X + CX]);
-          Exit;
-        end;
-      end;
-    end;
-end;
-
-function THexMap.CellToPos(Cell: TCell): TPoint;
-var
-  CX, CY: Integer;
-  X, Y: Double;
-  HexSize: TFloatPoint;
-  CellSize: TFloatPoint;
-  Points: array of TPoint;
-begin
-  CellSize := FloatPoint(DefaultCellSize.X / HexCellMulX, DefaultCellSize.Y / HexCellMulY);
-  HexSize := FloatPoint(DefaultCellSize.X, DefaultCellSize.Y);
-  X := Cell.Pos.X;
-  Y := Cell.Pos.Y;
-  if (Cell.Pos.Y and 1) = 1 then begin
-    X := X + 0.5;
-    //Y := Y + 0.5;
-  end;
-
-  Result.X := Trunc(X * CellSize.X);
-  Result.Y := Trunc(Y * CellSize.Y);
+    Result[Length(Result) - 1] := TCell(Cells[(CellPos.Y + Y) * FSize.X + (CellPos.X + X)]);
+  end;
 end;
 
@@ -1681 +1582 @@
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
-    NewCell.Pos := Point(X, Y);
-    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
-  with TCell(Cells[Y * FSize.X + X]) do begin
-    NeighCells := GetCellNeighbors2(TCell(Cells[Y * FSize.X + X]));
-    Neighbors.Count := Length(NeighCells);
-    for I := 0 to Length(NeighCells) - 1 do
-      Neighbors[I] := NeighCells[I];
     PX := X;
     PY := Y;
@@ -1698 +1588 @@
       //Y := Y + 0.5;
     end;
-    Polygon := GetHexagonPolygon(Point(Trunc(PX * DefaultCellSize.X / HexCellMulX),
-      Trunc(PY * DefaultCellSize.Y / HexCellMulY)), DefaultCellSize);
+    NewCell.PosPx := Point(Trunc(PX * DefaultCellSize.X / HexCellMulX),
+      Trunc(PY * DefaultCellSize.Y / HexCellMulY));
+    NewCell.Polygon := GetHexagonPolygon(NewCell.PosPx, DefaultCellSize);
+    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
+  with TCell(Cells[Y * FSize.X + X]) do begin
+    NeighCells := GetCellPosNeighbors(Point(X, Y));
+    Neighbors.Count := Length(NeighCells);
+    for I := 0 to Length(NeighCells) - 1 do
+      Neighbors[I] := NeighCells[I];
   end;
 end;