Changeset 248 for trunk

Timestamp:

Sep 22, 2018, 2:35:46 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Drawing Voronoi type map in cyclic mode.
• Fixed: Clear player cells before map cells regeneration.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (1 diff)
• UClientGUI.pas (modified) (2 diffs)
• UGeometry.pas (modified) (2 diffs)
• UMap.pas (modified) (1 diff)
• UMapType.pas (modified) (3 diffs)
• UPlayer.pas (modified) (3 diffs)

trunk/Forms/UFormClient.pas

@@ -12 +12 @@
 const
   ZoomFactor = 1.5;
-  MinZoom = 0.05;
+  MinZoom = 0.1;
   MaxZoom = 10;
   MouseMinDiff = 0.1;

trunk/UClientGUI.pas

@@ -507 +507 @@
   end;
   if Assigned(NewSelectedCell) then begin
+    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
+      SelectedCell := NewSelectedCell
+    end else
+    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
+      SelectedCell := nil;
+    end else
     if Assigned(SelectedCell) and TGame(Game).Map.IsCellsNeighbor(NewSelectedCell.MapCell, SelectedCell.MapCell) then begin
       if ssShift in ShiftState then begin
@@ -530 +536 @@
         SelectedCell := nil;
       end;
-    end else
-    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then
-      SelectedCell := NewSelectedCell
-    else
-    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then
-      SelectedCell := nil;
+    end;
   end;
 end;

trunk/UGeometry.pas

@@ -98 +98 @@
     constructor Create(const Points: TPointArray); overload;
     constructor Create(const Rect: TGRect<T>); overload;
+    procedure Move(P: T);
     function GetRect: TGRect<T>;
     function EdgeDistance(Polygon: TGPolygon<T>): Double;
@@ -331 +332 @@
 end;
 
+procedure TGPolygon<T>.Move(P: T);
+var
+  I: Integer;
+begin
+  for I := 0 to Length(Points) - 1 do
+    Points[I] := Points[I] + P;
+end;
+
 { TGLine }
 

trunk/UMap.pas

@@ -1190 +1190 @@
 end;
 
-
-
 end.
 

trunk/UMapType.pas

@@ -421 +421 @@
   MP: TPoint;
   LinkLine: TLine;
+  P: TPolygon;
+  AreaSize: TPoint;
 const
   CellGapWidth = 4;
@@ -441 +443 @@
   end;
 
-  // Compute polygon by catting out map area by all other cells
-  for Cell in Cells do begin
-    Cell.Polygon := TPolygon.Create(TRect.Create(TPoint.Create(0, 0),
-      TPoint.Create(Size.X * DefaultCellSize.X, Size.Y * DefaultCellSize.Y)));
-    for Cell2 in Cells do
-    if Cell2 <> Cell then begin
-      LinkLine := TLine.Create(Cell.PosPx, Cell2.PosPx);
-      LinkLine.Distance := LinkLine.Distance - CellGapWidth;
-      MP := LinkLine.GetMiddle;
-      // Create half plane vector
-      L1 := TLine.Create(MP, TPoint.Create(MP.X + LinkLine.GetSize.X,
-        MP.Y + LinkLine.GetSize.Y));
-
-      Cell.Polygon.CutLine(L1, Cell.PosPx);
+  AreaSize := TPoint.Create(Size.X * DefaultCellSize.X, Size.Y * DefaultCellSize.Y);
+
+  // Compute polygon by cutting out map area by all other cells
+  if Cyclic then begin
+    for Cell in Cells do begin
+      Cell.Polygon := TPolygon.Create(TRect.Create(
+        TPoint.Create(-AreaSize.X, -AreaSize.Y),
+        TPoint.Create(2 * AreaSize.X, 2 * AreaSize.Y)));
+      for Y := -1 to 1 do
+      for X := -1 to 1 do
+      for Cell2 in Cells do
+      if Cell2 <> Cell then begin
+        LinkLine := TLine.Create(Cell.PosPx, Cell2.PosPx +
+          TPoint.Create(X * AreaSize.X, Y * AreaSize.Y));
+        LinkLine.Distance := LinkLine.Distance - CellGapWidth;
+        MP := LinkLine.GetMiddle;
+        // Create half plane vector
+        L1 := TLine.Create(MP, TPoint.Create(MP.X + LinkLine.GetSize.X,
+          MP.Y + LinkLine.GetSize.Y));
+
+        Cell.Polygon.CutLine(L1, Cell.PosPx);
+      end;
+    end;
+  end else begin
+    for Cell in Cells do begin
+      Cell.Polygon := TPolygon.Create(TRect.Create(TPoint.Create(0, 0),
+        AreaSize));
+      for Cell2 in Cells do
+      if Cell2 <> Cell then begin
+        LinkLine := TLine.Create(Cell.PosPx, Cell2.PosPx);
+        LinkLine.Distance := LinkLine.Distance - CellGapWidth;
+        MP := LinkLine.GetMiddle;
+        // Create half plane vector
+        L1 := TLine.Create(MP, TPoint.Create(MP.X + LinkLine.GetSize.X,
+          MP.Y + LinkLine.GetSize.Y));
+
+        Cell.Polygon.CutLine(L1, Cell.PosPx);
+      end;
     end;
   end;
 
   // Link all cells with neighboring polygon edges
-  for I := 0 to Cells.Count - 1 do begin
-    for J := I + 1 to Cells.Count - 1 do begin
-      if Cells[I].Polygon.EdgeDistance(Cells[J].Polygon) < 2 * CellGapWidth then
-        Cells[I].ConnectTo(Cells[J]);
+  if Cyclic then begin
+    for I := 0 to Cells.Count - 1 do begin
+      for Y := -1 to 1 do
+      for X := -1 to 1 do
+      for J := 0 to Cells.Count - 1 do begin
+        P := Cells[J].Polygon;
+        P.Move(TPoint.Create(X * AreaSize.X, Y * AreaSize.Y));
+        if Cells[I].Polygon.EdgeDistance(P) < 2 * CellGapWidth then
+          Cells[I].ConnectTo(Cells[J]);
+      end;
+    end;
+  end else begin
+    for I := 0 to Cells.Count - 1 do begin
+      for J := I + 1 to Cells.Count - 1 do begin
+        if Cells[I].Polygon.EdgeDistance(Cells[J].Polygon) < 2 * CellGapWidth then
+          Cells[I].ConnectTo(Cells[J]);
+      end;
     end;
   end;
@@ -476 +515 @@
 function TVoronoiMap.CalculatePixelRect: TRect;
 begin
-  Result := inherited CalculatePixelRect;
-  Result.P2 := Result.P2 + TPoint.Create(
-    Trunc(0.02 * DefaultCellSize.X),
-    Trunc(0.02 * DefaultCellSize.Y)
-  );
+  Result.P1 := TPoint.Create(0, 0);
+  Result.P2 := TPoint.Create(Size.X * DefaultCellSize.X, Size.Y * DefaultCellSize.Y);
 end;
 

trunk/UPlayer.pas

@@ -55 +55 @@
     procedure SaveToNode(Node: TDOMNode);
     procedure Update;
+    procedure Clear;
     constructor Create;
     destructor Destroy; override;
@@ -422 +423 @@
 end;
 
+procedure TPlayerMap.Clear;
+begin
+  Cells.Clear;
+end;
+
 constructor TPlayerMap.Create;
 begin
@@ -730 +736 @@
   TurnStats.Clear;
   Moves.Clear;
+  PlayerMap.Clear;
 end;