Changeset 102

Timestamp:

Dec 26, 2014, 8:30:25 PM (9 years ago)

Author:

chronos

Message:

• Added: Load/save map cell links points in game save file.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (1 diff)
• UGame.pas (modified) (12 diffs)
• xtactics.lpi (modified) (2 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/Forms/UFormNew.pas

@@ -326 +326 @@
 var
   I: Integer;
-  NewItem: TListItem;
 begin
   CheckBoxSymetricMap.Checked := Game.SymetricMap;

trunk/UGame.pas

@@ -87 +87 @@
   end;
 
+  { TCellLink }
+
   TCellLink = class
     Points: array of TPoint;
     Cell1: TCell;
     Cell2: TCell;
-  end;
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
+  end;
+
+  { TCellLinks }
 
   TCellLinks = class(TObjectList)
-
+    Map: TMap;
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
   end;
 
@@ -154 +162 @@
   private
     FSize: TPoint;
-    FNewCellId: Integer;
     function GetSize: TPoint; virtual;
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
@@ -161 +168 @@
       Text: string);
     procedure SetSize(AValue: TPoint); virtual;
+  protected
+    FNewCellId: Integer;
     function GetNewCellId: Integer; virtual;
   public
@@ -190 +199 @@
     procedure ForEachCells(Method: TMethod); virtual;
     property Size: TPoint read GetSize write SetSize;
-  end;
-
-  { THexMap }
-
-  THexMap = class(TMap)
-  private
-    function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
-    procedure GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
-    function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
-  public
-    procedure LoadFromFile(FileName: string); override;
-    procedure SaveToFile(FileName: string); override;
-    function IsValidIndex(Index: TPoint): Boolean; override;
-    procedure Generate; override;
-  end;
-
-  { TSquareMap }
-
-  TSquareMap = class(TMap)
-  private
-    function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPointArray;
-  public
-    function IsValidIndex(Index: TPoint): Boolean; override;
-    procedure Generate; override;
-  end;
-
-  { TTriangleMap }
-
-  TTriangleMap = class(TMap)
-  private
-    function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPointArray;
-  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;
 
@@ -457 +423 @@
 implementation
 
+uses
+  UMap;
+
 resourcestring
   SMinimumPlayers = 'You need at least two players';
@@ -537 +506 @@
     ((((Color shr 16) and $ff) shr 1) shl 16) or
     ((((Color shr 24) and $ff) shr 0) shl 24);
+end;
+
+{ TCellLink }
+
+procedure TCellLink.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  Node3: TDOMNode;
+begin
+  Node3 := Node.FindNode('Points');
+  if Assigned(Node3) then begin
+    SetLength(Points, 0);
+    Node2 := Node3.FirstChild;
+    while Assigned(Node2) and (Node2.NodeName = 'Point') do begin
+      SetLength(Points, Length(Points) + 1);
+      Points[High(Points)].X := ReadInteger(Node2, 'X', 0);
+      Points[High(Points)].Y := ReadInteger(Node2, 'Y', 0);
+      Node2 := Node2.NextSibling;
+    end;
+  end;
+end;
+
+procedure TCellLink.SaveToNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+  NewNode2: TDOMNode;
+  I: Integer;
+begin
+  NewNode := Node.OwnerDocument.CreateElement('Points');
+  Node.AppendChild(NewNode);
+  for I := 0 to Length(Points) - 1 do begin
+    NewNode2 := NewNode.OwnerDocument.CreateElement('Point');
+    NewNode.AppendChild(NewNode2);
+    WriteInteger(NewNode2, 'X', Points[I].X);
+    WriteInteger(NewNode2, 'Y', Points[I].Y);
+  end;
+end;
+
+{ TCellLinks }
+
+procedure TCellLinks.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  NewCell: TCellLink;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'CellLink') do begin
+    NewCell := TCellLink.Create;
+    //NewCell.Map := Map;
+    NewCell.LoadFromNode(Node2);
+    Add(NewCell);
+    Node2 := Node2.NextSibling;
+  end;
+end;
+
+procedure TCellLinks.SaveToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode2: TDOMNode;
+begin
+  for I := 0 to Count - 1 do
+  with TCellLink(Items[I]) do begin
+    NewNode2 := Node.OwnerDocument.CreateElement('CellLink');
+    Node.AppendChild(NewNode2);
+    SaveToNode(NewNode2);
+  end;
 end;
 
@@ -976 +1012 @@
     TUnitMove(Items[I]).SaveToNode(NewNode);
   end;
-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
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
-  // 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.Map := Self;
-    NewCell.PosPx := Point(Trunc(Random * FSize.X * DefaultCellSize.X), Trunc(Random * FSize.Y * DefaultCellSize.Y));
-    SetLength(NewCell.Polygon, 1);
-    NewCell.Polygon[0] := NewCell.PosPx;
-    NewCell.Id := GetNewCellId;
-    Cells[Y * FSize.X + X] := NewCell;
-  end;
-end;
-
-{ TTriangleMap }
-
-function TTriangleMap.GetTrianglePolygon(Pos: TPoint; Size: TPoint;
-  Reverse: Boolean): TPointArray;
-var
-  Rev: Integer;
-begin
-  if Reverse then Rev := -1
-    else Rev := 1;
-  SetLength(Result, 3);
-  Result[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
-  Result[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - (Size.Y * 0.8) / 2 * Rev));
-  Result[2] := Point(Trunc(Pos.X), Trunc(Pos.Y + (Size.Y * 1.2) / 2 * Rev));
-end;
-
-function TTriangleMap.IsValidIndex(Index: TPoint): Boolean;
-begin
-  Result := (Index.X >= 0) and (Index.X < Size.X) and
-    (Index.Y >= 0) and (Index.Y < Size.Y);
-end;
-
-procedure TTriangleMap.Generate;
-var
-  X, Y: Integer;
-  Rev: Integer;
-  Reverse: Boolean;
-  NewCell: TCell;
-begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
-  // 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.Map := Self;
-    Reverse := Boolean(X mod 2) xor Boolean(Y mod 2);
-    if Reverse then Rev := -1
-      else Rev := 1;
-    NewCell.PosPx := Point(Trunc(X * DefaultCellSize.X * TriangleCellMulX),
-      Trunc((Y * DefaultCellSize.Y * TriangleCellMulY) - (0.1 * Rev * DefaultCellSize.Y)));
-    NewCell.Polygon := GetTrianglePolygon(NewCell.PosPx, DefaultCellSize, Reverse);
-    NewCell.Id := GetNewCellId;
-    Cells[Y * FSize.X + X] := NewCell;
-  end;
-
-  // Generate neighbours
-  for Y := 0 to Self.FSize.Y - 1 do
-  for X := 0 to FSize.X - 1 do
-  with TCell(Cells[Y * FSize.X + X]) do begin
-    if Boolean(X mod 2) xor Boolean(Y mod 2) then Rev := -1
-      else Rev := 1;
-    if IsValidIndex(Point(X + 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X + 1)]));
-    if IsValidIndex(Point(X + 0, Y - 1 * Rev)) then
-      Neighbors.Add(TCell(Cells[(Y - 1 * Rev) * FSize.X + (X + 0)]));
-    if IsValidIndex(Point(X - 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X - 1)]));
-  end;
-end;
-
-{ TSquareMap }
-
-procedure TSquareMap.Generate;
-var
-  X, Y: Integer;
-  NewCell: TCell;
-begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
-  // 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.Map := Self;
-    NewCell.PosPx := Point(Trunc(X * DefaultCellSize.X * SquareCellMulX),
-      Trunc(Y * DefaultCellSize.Y * SquareCellMulY));
-    NewCell.Polygon := GetSquarePolygon(NewCell.PosPx, DefaultCellSize);
-    NewCell.Id := GetNewCellId;
-    Cells[Y * FSize.X + X] := NewCell;
-  end;
-
-  // 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
-    if IsValidIndex(Point(X + 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X + 1)]));
-    if IsValidIndex(Point(X + 0, Y + 1)) then
-      Neighbors.Add(TCell(Cells[(Y + 1) * FSize.X + (X + 0)]));
-    if IsValidIndex(Point(X - 1, Y + 0)) then
-      Neighbors.Add(TCell(Cells[(Y + 0) * FSize.X + (X - 1)]));
-    if IsValidIndex(Point(X + 0, Y - 1)) then
-      Neighbors.Add(TCell(Cells[(Y - 1) * FSize.X + (X + 0)]));
-  end;
-end;
-
-function TSquareMap.IsValidIndex(Index: TPoint): Boolean;
-begin
-  Result := (Index.X >= 0) and (Index.X < Size.X) and
-    (Index.Y >= 0) and (Index.Y < Size.Y);
-end;
-
-function TSquareMap.GetSquarePolygon(Pos: TPoint; Size: TPoint): TPointArray;
-begin
-  SetLength(Result, 4);
-  Result[0] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
-  Result[1] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y - Size.Y / 2));
-  Result[2] := Point(Trunc(Pos.X + Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
-  Result[3] := Point(Trunc(Pos.X - Size.X / 2), Trunc(Pos.Y + Size.Y / 2));
 end;
 
@@ -1263 +1151 @@
   if Assigned(Node2) then
     Cells.LoadFromNode(Node2);
+  Node2 := Node.FindNode('CellLinks');
+  if Assigned(Node2) then
+    CellLinks.LoadFromNode(Node2);
 end;
 
@@ -1280 +1171 @@
   Node.AppendChild(NewNode);
   Cells.SaveToNode(NewNode);
+  NewNode := Node.OwnerDocument.CreateElement('CellLinks');
+  Node.AppendChild(NewNode);
+  CellLinks.SaveToNode(NewNode);
 end;
 
@@ -1415 +1309 @@
   Image := TImage.Create(nil);
   CellLinks := TCellLinks.Create;
+  CellLinks.Map := Self;
   Areas := TMapAreas.Create;
 end;
@@ -2987 +2882 @@
 end;
 
-{ THexMap }
-
-function THexMap.GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
-var
-  Shift: TFloatPoint;
-begin
-  Shift := FloatPoint(0.5 * cos(30 / 180 * Pi), 0.5 * sin(30 / 180 * Pi));
-  SetLength(Result, 6);
-  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;
-
-function THexMap.IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
-var
-  DX: Integer;
-  DY: Integer;
-  MinY: Integer;
-begin
-  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
-    not ((DX = 1) and (DY = -1)) and
-    not ((DX = -1) and (DY = 1))) or
-    (((MinY mod 2) = 0) and
-    not ((DX = -1) and (DY = -1)) and
-    not ((DX = 1) and (DY = 1))));
-  Result := Result and not ((CellPos1.X = CellPos2.X) and (CellPos1.Y = CellPos2.Y));
-end;
-
-procedure THexMap.LoadFromFile(FileName: string);
-var
-  Doc: TXMLDocument;
-begin
-  try
-    ReadXMLFile(Doc, FileName);
-    if Doc.DocumentElement.TagName <> 'Map' then
-      raise Exception.Create('Invalid map format');
-  finally
-    Doc.Free;
-  end;
-  inherited LoadFromFile(FileName);
-end;
-
-procedure THexMap.SaveToFile(FileName: string);
-var
-  Doc: TXMLDocument;
-  RootNode: TDOMNode;
-begin
-  try
-    Doc := TXMLDocument.Create;
-    RootNode := Doc.CreateElement('Map');
-    Doc.Appendchild(RootNode);
-    WriteXMLFile(Doc, FileName);
-  finally
-    Doc.Free;
-  end;
-  inherited SaveToFile(FileName);
-end;
-
-function THexMap.IsValidIndex(Index: TPoint): Boolean;
-begin
-  Result := (Index.X >= 0) and (Index.X < Size.X) and
-    (Index.Y >= 0) and (Index.Y < Size.Y);
-end;
-
-procedure THexMap.GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
-var
-  X, Y: Integer;
-begin
-  Neighbours.Count := 0;
-  for Y := -1 to 1 do
-  for X := -1 to 1 do
-  if IsValidIndex(Point(CellPos.X + X, CellPos.Y + Y)) and
-  IsCellsPosNeighbor(CellPos, Point((CellPos.X + X), (CellPos.Y + Y))) then begin
-    Neighbours.Add(TCell(Cells[(CellPos.Y + Y) * FSize.X + (CellPos.X + X)]));
-  end;
-end;
-
 procedure TMap.Paint(Canvas: TCanvas; View: TView);
 var
@@ -3134 +2944 @@
 end;
 
-procedure THexMap.Generate;
-var
-  X, Y: Integer;
-  I: Integer;
-  NewCell: TCell;
-  PX, PY: Double;
-begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
-  // 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.Map := Self;
-    PX := X;
-    PY := Y;
-    if (Y and 1) = 1 then begin
-      PX := PX + 0.5;
-      //Y := Y + 0.5;
-    end;
-    NewCell.PosPx := Point(Trunc(PX * DefaultCellSize.X / HexCellMulX),
-      Trunc(PY * DefaultCellSize.Y / HexCellMulY));
-    NewCell.Polygon := GetHexagonPolygon(NewCell.PosPx, DefaultCellSize);
-    NewCell.Id := GetNewCellId;
-    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
-    GetCellPosNeighbors(Point(X, Y), Neighbors);
-  end;
-end;
-
 end.

trunk/xtactics.lpi

@@ -87 +87 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="10">
+    <Units Count="11">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -161 +161 @@
         <UnitName Value="UFormHelp"/>
       </Unit9>
+      <Unit10>
+        <Filename Value="UMap.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UMap"/>
+      </Unit10>
     </Units>
   </ProjectOptions>

trunk/xtactics.lpr

@@ -12 +12 @@
   { you can add units after this },
   SysUtils, UFormSettings, UFormMain, UFormMove, UFormNew, UFormAbout,
-  UFormHelp;
+  UFormHelp, UMap;
 
 {$R *.res}