Changeset 174 for trunk

Timestamp:

Nov 26, 2017, 11:35:25 AM (7 years ago)

Author:

chronos

Message:

• Modified: Improved generation of random mesh map to avoid overlapping cells polygons and removed links from non-neighboring cells.

Location:

trunk

Files:

• Packages/Common/UGeometry.pas (modified) (3 diffs)
• UCore.pas (modified) (1 diff)
• UMap.pas (modified) (7 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/Packages/Common/UGeometry.pas

@@ -95 +95 @@
     constructor Create(const Rect: TGRect<T>); overload;
     function GetRect: TGRect<T>;
+    function EdgeDistance(Polygon: TGPolygon<T>): Double;
     procedure AddPoint(const P: T);
     procedure Clear;
@@ -157 +158 @@
 end;
 
-{ TPolygon }
+{ TGPolygon }
 
 function TGPolygon<T>.GetPoint(const Index: Integer): T;
@@ -282 +283 @@
 end;
 
-{ TLine }
+function TGPolygon<T>.EdgeDistance(Polygon: TGPolygon<T>): Double;
+var
+  I, J: Integer;
+  Dist: Double;
+begin
+  Result := Infinity;
+  for I := 0 to Length(Points) - 1 do
+  for J := 0 to Length(Polygon.Points) - 1 do begin
+    Dist := TGLine<T>.Create(Points[I], Polygon.Points[J]).Distance;
+    if Dist < Result then Result := Dist;
+  end;
+end;
+
+{ TGLine }
 
 function TGLine<T>.GetDistance: Double;

trunk/UCore.pas

@@ -397 +397 @@
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
-  StoredDimension.Free;;
+  FreeAndNil(StoredDimension);
   Game.SaveConfig(XMLConfig1, 'Game');
   SaveConfig;

trunk/UMap.pas

@@ -259 +259 @@
   CellDistance: TCellsDistance;
   Cell: TCell;
+  Cell2: TCell;
   L1, L2: TLine;
   MP: TPoint;
   LinkLine: TLine;
-  Polygon: TPolygon;
-  //LeftLink: TCellsDistance;
-  //CenterLink: TCellsDistance;
-  //RightLink: TCellsDistance;
   LeftClosingLine1: TLine;
   LeftClosingLine2: TLine;
@@ -283 +280 @@
   LeftCellCommon: TCell;
   RightCellCommon: TCell;
-  //LeftText: string;
-  //RightText: string;
-  NeighborCell: TCell;
+const
+  CellGapWidth = 4;
 begin
   Clear;
@@ -306 +302 @@
   // Calculate distance between all cells
   CellsDistance := TFPGObjectList<TCellsDistance>.Create;
-  for I1 := 1 to Cells.Count - 1 do
+  for I1 := 0 to Cells.Count - 1 do
   for I2 := I1 + 1 to Cells.Count - 1 do begin
     NewCellDist := TCellsDistance.Create;
@@ -362 +358 @@
       LeftCell := Cell.Neighbors[I];
       RightCell := Cell.Neighbors[(I + 1) mod Cell.Neighbors.Count];
-      //LeftText := LeftCell.Neighbors.ToString;
-      //RightText := RightCell.Neighbors.ToString;
       LeftIndex := LeftCell.Neighbors.IndexOf(Cell);
       RightIndex := RightCell.Neighbors.IndexOf(Cell);
@@ -406 +400 @@
   end;
 
-  // Compute polygon around cells with sequence sorted by link angle
+  {// Compute polygon around cells with sequence sorted by link angle
   for Cell in Cells do begin
     // Use whole map first for cell polygon
@@ -414 +408 @@
       for NeighborCell in Cell.Neighbors do begin
         LinkLine := TLine.Create(Cell.PosPx, NeighborCell.PosPx);
-        LinkLine.Distance := LinkLine.Distance - 4;
+        LinkLine.Distance := LinkLine.Distance - CellGapWidth;
         MP := LinkLine.GetMiddle;
         // Create half plane vector
@@ -424 +418 @@
       Cell.Polygon := Polygon;
     end else Cell.Polygon.Clear;
+  end;}
+
+  // Additional polygon 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);
+    end;
+  end;
+
+  // Remove all neighbor links for cell pairs with non-overlaping polygons
+  for Cell in Cells do begin
+    for I := Cell.Neighbors.Count - 1 downto 0 do begin
+      if Cell.Polygon.EdgeDistance(Cell.Neighbors[I].Polygon) > 2 * CellGapWidth then
+        Cell.Neighbors.Delete(I);
+    end;
   end;
 

trunk/xtactics.lpr

@@ -11 +11 @@
   CoolTranslator, TemplateGenerics, UFormPlayer
   { you can add units after this },
-  SysUtils, UFormMain, UFormMove, UFormNew, UFormCharts, UFormUnitMoves, UGeometryClasses;
+  SysUtils, UFormMain, UFormMove, UFormNew, UFormCharts, UFormUnitMoves;
 
 {$R *.res}