Changeset 268 for trunk/UMapType.pas

Timestamp:

Jan 20, 2019, 9:32:16 PM (6 years ago)

Author:

chronos

Message:

• Added: New menu action show/hide map grid lines.
• Modified: Draw cell polygons without a gap so it can be drawn as solid surface without grid lines.

File:

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

trunk/UMapType.pas

@@ -20 +20 @@
   private
     const
-      CellMulX = 1.12;
-      CellMulY = 1.292;
+      CellMulX = 1.12 * 1.028;
+      CellMulY = 1.292 * 1.03;
     function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
     procedure GetCellPosNeighbors(CellPos: TPoint; Cell: TCell);
@@ -38 +38 @@
   TSquareMap = class(TMap)
   private
-    const
-      CellMulX = 1.05;
-      CellMulY = 1.05;
     function GetSquarePolygon(Pos: TPoint; Size: TPoint): TPolygon;
   public
     procedure Generate; override;
-    function CalculatePixelRect: TRect; override;
   end;
 
@@ -52 +48 @@
   private
     const
-      CellMulX = 0.55;
-      CellMulY = 1.05;
+      CellMulX = 0.5;
+      CellMulY = 1;
     function GetTrianglePolygon(Pos: TPoint; Size: TPoint; Reverse: Boolean): TPolygon;
   protected
@@ -76 +72 @@
   private
     const
-      CellMulX = 0.95;
-      CellMulY = 3.35;
+      CellMulX = 1;
+      CellMulY = 3.5;
     function GetTilePolygon(Pos: TPoint; Size: TPoint): TPolygon;
   protected
@@ -173 +169 @@
   Result := inherited CalculatePixelRect;
   Result.P2 := Result.P2 - TPoint.Create(
-    Trunc(0.45 * DefaultCellSize.X / CellMulX),
-    Trunc(0.90 * DefaultCellSize.Y / CellMulY)
+    Trunc(0.5 * DefaultCellSize.X / CellMulX),
+    Trunc(DefaultCellSize.Y / CellMulY)
   );
 end;
@@ -212 +208 @@
   Shift := TPointF.Create(0.5, 0.5) * TPointF.Create(Cos(Angle), Sin(Angle));
   Result.P2 := Result.P2 - TPoint.Create(
-    Trunc(0.47 * DefaultCellSize.X / CellMulX),
-    Trunc(1.2 * Shift.Y * DefaultCellSize.Y / CellMulY)
+    Trunc(0.5 * DefaultCellSize.X / CellMulX),
+    Trunc(1.35 * Shift.Y * DefaultCellSize.Y / CellMulY)
   );
 end;
@@ -344 +340 @@
     NewCell := TCell.Create;
     NewCell.Map := Self;
-    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X * CellMulX),
-      Trunc(Y * DefaultCellSize.Y * CellMulY));
+    NewCell.PosPx := TPoint.Create(Trunc(X * DefaultCellSize.X),
+      Trunc(Y * DefaultCellSize.Y));
     NewCell.Polygon := GetSquarePolygon(NewCell.PosPx, DefaultCellSize);
     NewCell.Id := GetNewCellId;
@@ -382 +378 @@
 
   FPixelRect := CalculatePixelRect;
-end;
-
-function TSquareMap.CalculatePixelRect: TRect;
-begin
-  Result := inherited CalculatePixelRect;
-  Result.P2 := Result.P2 + TPoint.Create(
-    Trunc(0.05 * DefaultCellSize.X / CellMulX),
-    Trunc(0.05 * DefaultCellSize.Y / CellMulY)
-  );
 end;
 
@@ -424 +411 @@
   AreaSize: TPoint;
 const
-  CellGapWidth = 4;
+  LinkTolerance = 8;
 begin
   Clear;
@@ -457 +444 @@
         LinkLine := TLine.Create(Cell.PosPx, Cell2.PosPx +
           TPoint.Create(X * AreaSize.X, Y * AreaSize.Y));
-        LinkLine.Distance := LinkLine.Distance - CellGapWidth;
+        LinkLine.Distance := LinkLine.Distance;
         MP := LinkLine.GetMiddle;
         // Create half plane vector
@@ -473 +460 @@
       if Cell2 <> Cell then begin
         LinkLine := TLine.Create(Cell.PosPx, Cell2.PosPx);
-        LinkLine.Distance := LinkLine.Distance - CellGapWidth;
+        LinkLine.Distance := LinkLine.Distance;
         MP := LinkLine.GetMiddle;
         // Create half plane vector
@@ -493 +480 @@
         P := Cells[J].Polygon;
         P.Move(TPoint.Create(X * AreaSize.X, Y * AreaSize.Y));
-        if Cells[I].Polygon.EdgeDistance(P) < 2 * CellGapWidth then
+        if Cells[I].Polygon.EdgeDistance(P) < LinkTolerance then
           Cells[I].ConnectTo(Cells[J]);
       end;
@@ -500 +487 @@
     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
+        if Cells[I].Polygon.EdgeDistance(Cells[J].Polygon) < LinkTolerance then
           Cells[I].ConnectTo(Cells[J]);
       end;
@@ -603 +590 @@
   Result := inherited CalculatePixelRect;
   Result.P2 := Result.P2 + TPoint.Create(
-    Trunc(0.05 * DefaultCellSize.X / CellMulX - 0.30 * DefaultCellSize.X / CellMulX),
-    Trunc(0.05 * DefaultCellSize.Y / CellMulY)
+    Trunc(- 0.25 * DefaultCellSize.X / CellMulX),
+    0
   );
 end;