Changeset 248 for trunk/UMapType.pas

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.

File:

• trunk/UMapType.pas (modified) (3 diffs)

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;