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

Timestamp:

Jun 25, 2020, 10:24:44 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Scaling IsoEngine ForgOfWar sprites.
• Fixed: PopupMenu position calculated using not scaled GetSystemMetrics.
• Fixed: Scale TDpiBitmaps using normal scaling functions to get pixels on valid expected possition.
• Fixed: DpiBitBlt needs to be executed as StretchDraw for non-integer pixel scaling. This leads to slower drawing.

File:

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

branches/highdpi/LocalPlayer/IsoEngine.pas

@@ -375 +375 @@
   begin
     for i := 0 to yyt * 3 - 1 do
-      MaskLine[i] := PixelPointer(Mask24, 0, 1 + ySrc * (yyt * 3 + 1) + i);
-    for xSrc := 0 to 9 - 1 do
-    begin
-      i := ySrc * 9 + xSrc;
+      MaskLine[i] := PixelPointer(Mask24, 0, ScaleToNative(1 + ySrc * (yyt * 3 + 1) + i));
+    for xSrc := 0 to TerrainIconCols - 1 do begin
+      i := ySrc * TerrainIconCols + xSrc;
       TSpriteSize[i].Left := 0;
       repeat
         Border := true;
         for y := 0 to yyt * 3 - 1 do begin
-          MaskLine[y].SetX(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left);
+          MaskLine[y].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[i].Left));
           if MaskLine[y].Pixel^.B = 0 then Border := false;
         end;
@@ -392 +391 @@
         Border := true;
         for x := 0 to xxt * 2 - 1 do begin
-          MaskLine[TSpriteSize[i].Top].SetX(1 + xSrc * (xxt * 2 + 1) + x);
+          MaskLine[TSpriteSize[i].Top].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + x));
           if MaskLine[TSpriteSize[i].Top].Pixel^.B = 0 then Border := false;
         end;
@@ -401 +400 @@
         Border := true;
         for y := 0 to yyt * 3 - 1 do begin
-          MaskLine[y].SetX(xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right);
+          MaskLine[y].SetX(ScaleToNative(xSrc * (xxt * 2 + 1) + TSpriteSize[i].Right));
           if MaskLine[y].Pixel^.B = 0 then Border := false;
         end;
@@ -410 +409 @@
         Border := true;
         for x := 0 to xxt * 2 - 1 do begin
-          MaskLine[TSpriteSize[i].Bottom - 1].SetX(1 + xSrc * (xxt * 2 + 1) + x);
+          MaskLine[TSpriteSize[i].Bottom - 1].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + x));
           if MaskLine[TSpriteSize[i].Bottom - 1].Pixel^.B = 0 then Border := false;
         end;
@@ -1079 +1078 @@
   if not(FoW and (Tile and fObserved = 0)) then
     PaintBorder;
-
   if (Loc >= 0) and (Loc < G.lx * G.ly) and (Loc = FAdviceLoc) then
     TSprite(x, y, spPlain);
@@ -1289 +1287 @@
   i: integer;
 begin
+  FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   FOutput.Canvas.pen.Color := $000000; // $FF shl (8*random(3));
   for i := 0 to nx div 2 do
@@ -1560 +1559 @@
         PaintTileExtraTerrain(x + xxt * dx, y + yyt + yyt * dy,
           dLoc(Loc, dx, dy));
+
   if CityOwner >= 0 then
   begin