Changeset 212 for branches/highdpi/LocalPlayer/IsoEngine.pas

Timestamp:

May 9, 2020, 9:35:25 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Better High DPI scaling on highdpi branch.

File:

• branches/highdpi/LocalPlayer/IsoEngine.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -34 +34 @@
     function IsShoreTile(Loc: integer): boolean;
     procedure MakeDark(Line: PPixelPointer; Length: Integer);
-    procedure ShadeOutside(x0, y0, x1, y1, xm, ym: integer);
+    procedure ShadeOutside(x0, y0, Width, Height, xm, ym: integer);
   protected
     FOutput: TDpiBitmap;
@@ -1015 +1015 @@
             1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
           Borders.BeginUpdate;
-          for dy := 0 to yyt * 2 - 1 do
-          begin
-            PixelPtr := PixelPointer(Borders, 0, p1 * (yyt * 2) + dy);
-            for dx := 0 to xxt * 2 - 1 do begin
+          PixelPtr := PixelPointer(Borders, ScaleToVcl(0), ScaleToVcl(p1 * (yyt * 2)));
+          for dy := 0 to ScaleToVcl(yyt * 2) - 1 do begin
+            for dx := 0 to ScaleToVcl(xxt * 2) - 1 do begin
               if PixelPtr.Pixel^.B = 99 then begin
                 PixelPtr.Pixel^.B := Tribe[p1].Color shr 16 and $FF;
@@ -1026 +1025 @@
               PixelPtr.NextPixel;
             end;
+            PixelPtr.NextLine;
           end;
           Borders.EndUpdate;
@@ -1330 +1330 @@
 end;
 
-procedure TIsoMap.ShadeOutside(x0, y0, x1, y1, xm, ym: integer);
+procedure TIsoMap.ShadeOutside(x0, y0, Width, Height, xm, ym: integer);
 const
   rShade = 3.75;
@@ -1339 +1339 @@
 begin
   FOutput.BeginUpdate;
-  for y := y0 to y1 - 1 do begin
-    Line := PixelPointer(FOutput, 0, y);
-    y_n := (y - ym) / yyt;
-    if abs(y_n) < rShade then begin
+  Line := PixelPointer(FOutput, ScaleToVcl(x0), ScaleToVcl(y0));
+  for y := 0 to ScaleToVcl(Height) - 1 do begin
+    y_n := (ScaleFromVcl(y) + y0 - ym) / yyt;
+    if Abs(y_n) < rShade then begin
       // Darken left and right parts of elipsis
-      w_n := sqrt(sqr(rShade) - sqr(y_n));
-      wBright := trunc(w_n * xxt + 0.5);
-      Line.SetX(x0);
-      MakeDark(@Line, xm - x0 - wBright);
-      Line.SetX(xm + wBright);
-      MakeDark(@Line, x1 - xm - wBright);
+      w_n := Sqrt(Sqr(rShade) - Sqr(y_n));
+      wBright := Trunc(w_n * xxt + 0.5);
+      Line.SetX(0);
+      MakeDark(@Line, ScaleToVcl(xm - wBright));
+      Line.SetX(ScaleToVcl(xm + wBright));
+      MakeDark(@Line, ScaleToVcl(Width - xm - wBright));
     end else begin
       // Darken entire line
-      Line.SetX(x0);
-      MakeDark(@Line, x1 - x0);
+      Line.SetX(0);
+      MakeDark(@Line, ScaleToVcl(Width));
     end;
+    Line.NextLine;
   end;
   FOutput.EndUpdate;
@@ -1576 +1577 @@
     xm := x + (dx + 1) * xxt;
     ym := y + (dy + 1) * yyt + yyt;
-    ShadeOutside(FLeft, FTop, FRight, FBottom, xm, ym);
+    ShadeOutside(FLeft, FTop, FRight - FLeft, FBottom - FTop, xm, ym);
     CityGrid(xm, ym, CityAllowClick);
     for dy := -2 to ny + 1 do