Changeset 24 for trunk

Timestamp:

Mar 3, 2014, 12:03:16 AM (11 years ago)

Author:

chronos

Message:

• Fixed: Cell position conversion and map painting.

File:

• trunk/UGame.pas (modified) (8 diffs)

trunk/UGame.pas

@@ -625 +625 @@
       if (CX >= 0) and (CY >= 0) and (CY < Size.Y) and (CX < Size.X) then
       if Cells[CY, CX].Terrain = ttNormal then begin
-        Points := GetHexagonPolygon(Point(Trunc(X * CellSize.X - Frac(SourceRect.Left / CellSize.X) * CellSize.X),
-          Trunc(Y * CellSize.Y - Frac(SourceRect.Top / CellSize.Y) * CellSize.Y)),
+        Points := GetHexagonPolygon(Point(Trunc(X * CellSize.X),
+          Trunc(Y * CellSize.Y)),
           Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
         if PtInPoly(Points, Pos) then begin
@@ -645 +645 @@
 begin
   with View do begin
-  CellSize := FloatPoint(DefaultCellSize.X / CellMulX * View.Zoom, DefaultCellSize.Y / CellMulY * View.Zoom);
-  HexSize := FloatPoint(DefaultCellSize.X * View.Zoom, DefaultCellSize.Y * View.Zoom);
-  X := Cell.Pos.X - Trunc(SourceRect.Left / CellSize.X);
-  Y := Cell.Pos.Y - Trunc(SourceRect.Top / CellSize.Y);
+  CellSize := FloatPoint(DefaultCellSize.X / CellMulX, DefaultCellSize.Y / CellMulY);
+  HexSize := FloatPoint(DefaultCellSize.X, DefaultCellSize.Y);
+  X := Cell.Pos.X;
+  Y := Cell.Pos.Y;
   if (Cell.Pos.Y and 1) = 1 then begin
     X := X + 0.5;
@@ -654 +654 @@
   end;
 
-  Result.X := Trunc(X * CellSize.X - Frac(SourceRect.Left / CellSize.X) * CellSize.X);
-  Result.Y := Trunc(Y * CellSize.Y - Frac(SourceRect.Top / CellSize.Y) * CellSize.Y);
-  end;
-end;
-
+  Result.X := Trunc(X * CellSize.X);
+  Result.Y := Trunc(Y * CellSize.Y);
+  end;
+end;
 
 procedure THexMap.Paint(Canvas: TCanvas; View: TView; SelectedCell: TCell; FocusedCell: TCell);
@@ -672 +671 @@
   PosFrom, PosTo: TPoint;
 
-procedure PaintHexagon(X, Y: Double; Text: string);
+procedure PaintHexagon(Pos: TPoint; Text: string);
 var
   Points: array of TPoint;
@@ -684 +683 @@
       Pen.Style := psClear;
     end;
-    Points := GetHexagonPolygon(Point(Trunc(X), Trunc(Y)), Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
+    Points := GetHexagonPolygon(Point(Trunc(Pos.X), Trunc(Pos.Y)), Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
     Polygon(Points);
     Pen.Style := psSolid;
     Font.Color := clWhite;
     Font.Size := Trunc(12 * View.Zoom);
-    TextOut(Round(X) - TextWidth(Text) div 2, Round(Y) - TextHeight(Text) div 2, Text);
+    TextOut(Round(Pos.X) - TextWidth(Text) div 2, Round(Pos.Y) - TextHeight(Text) div 2, Text);
   end;
 end;
@@ -709 +708 @@
     for CY := Trunc(SourceRect.Top / CellSize.Y) to Trunc(SourceRect.Bottom / CellSize.Y) + 1 do
     for CX := Trunc(SourceRect.Left / CellSize.X) to Trunc(SourceRect.Right / CellSize.X) + 1 do begin
-      X := CX - Trunc(SourceRect.Left / CellSize.X);
-      Y := CY - Trunc(SourceRect.Top / CellSize.Y);
+      X := CX;
+      Y := CY;
       if (CY and 1) = 1 then begin
         X := X + 0.5;
@@ -722 +721 @@
             else Brush.Color := Cell.GetColor;
           Pen.Color := clBlack;
-          PaintHexagon(X * CellSizeZoomed.X - Frac(SourceRect.Left / CellSize.X) * CellSizeZoomed.X,
-            Y * CellSizeZoomed.Y - Frac(SourceRect.Top / CellSize.Y) * CellSizeZoomed.Y, IntToStr(Cell.GetAvialPower));
+          PaintHexagon(View.CellToCanvasPos(Point(Trunc(X * CellSize.X),
+            Trunc(Y * CellSize.Y))),
+            IntToStr(Cell.GetAvialPower));
           // Draw arrows
           Pen.Color := clCream;
@@ -729 +729 @@
             PosFrom := CellToPos(Cell, View);
             PosTo := CellToPos(TMove(Cell.MovesFrom[I]).CellTo, View);
-            Line(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 4),
-              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 4),
-              Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
-              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2));
+            Line(View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 4),
+              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 4))),
+              View.CellToCanvasPos(Point(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+              Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2))));
           end;
         end;