Changeset 246 for branches/highdpi/LocalPlayer/Help.pas

Timestamp:

May 21, 2020, 8:17:38 PM (4 years ago)

Author:

chronos

Message:

• Modified: Update from trunk rev 245.
• Modified: Vcl prefix/suffix changed to Native.

File:

• branches/highdpi/LocalPlayer/Help.pas (modified) (2 diffs)

branches/highdpi/LocalPlayer/Help.pas

@@ -443 +443 @@
   MaxSum = 9 * 9 * 255 * 75 div 100;
 var
-  x, y, dx, dy, xSrc, ySrc, Sum, xx: integer;
+  x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
   Heaven: array [0..nHeaven] of integer;
-  PaintPtr: TPixelPointer;
-  CoalPtr: TPixelPointer;
+  PaintPtr, CoalPtr: TPixelPointer;
   ImpPtr: array [-1..1] of TPixelPointer;
 begin
@@ -458 +457 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ScaleToVcl(ySizeBig * 2) - 1 do
-    if ((ScaleToVcl(y0) + y) >= 0) and ((ScaleToVcl(y0) + y) < ScaleToVcl(InnerHeight)) then begin
-      PaintPtr := PixelPointer(OffScreen, 0, ScaleToVcl(y0) + y);
-      CoalPtr := PixelPointer(Templates, 0, ScaleToVcl(yCoal) + y);
+  for y := 0 to ScaleToNative(ySizeBig) * 2 - 1 do
+    if ((ScaleToNative(y0) + y) >= 0) and ((ScaleToNative(y0) + y) < ScaleToNative(InnerHeight)) then begin
+      PaintPtr := PixelPointer(OffScreen, 0, ScaleToNative(y0) + y);
+      CoalPtr := PixelPointer(Templates, 0, ScaleToNative(yCoal) + y);
       for dy := -1 to 1 do
-        if ((Max(y + ScaleToVcl(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToVcl(dy), 0) shr 1) < ScaleToVcl(ySizeBig)) then
-          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToVcl(ySrc) + (Max(y + ScaleToVcl(dy), 0) shr 1));
-      for x := 0 to ScaleToVcl(xSizeBig * 2) - 1 do begin
-        Sum := 0;
+        if ((Max(y + ScaleToNative(dy), 0) shr 1) >= 0) and ((Max(y + ScaleToNative(dy), 0) shr 1) < ScaleToNative(ySizeBig)) then
+          ImpPtr[dy] := PixelPointer(BigImp, 0, ScaleToNative(ySrc) + (Max(y + ScaleToNative(dy), 0) shr 1));
+      for x := 0 to ScaleToNative(xSizeBig) * 2 - 1 do begin
+        sum := 0;
         for dx := -1 to 1 do begin
-          xx := ScaleToVcl(xSrc) + Max((x + ScaleToVcl(dx)), 0) shr 1;
+          xx := ScaleToNative(xSrc) + Max((x + ScaleToNative(dx)), 0) shr 1;
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((y + ScaleToVcl(dy)) shr 1 < 0) or ((y + ScaleToVcl(dy)) shr 1 >= ScaleToVcl(ySizeBig)) or
-              ((x + ScaleToVcl(dx)) shr 1 < 0) or ((x + ScaleToVcl(dx)) shr 1 >= ScaleToVcl(xSizeBig)) or
-              ((y + ScaleToVcl(dy)) shr 1 < ScaleToVcl(nHeaven)) and
+            if ((y + ScaleToNative(dy)) shr 1 < 0) or ((y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
+              ((x + ScaleToNative(dx)) shr 1 < 0) or ((x + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
+              ((y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
               (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromVcl(y) + dy) shr 1]) then
-              Sum := Sum + 9 * 255
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y) + dy) shr 1]) then
+              sum := sum + 9 * 255
             else
-              Sum := Sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
+              sum := sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
                 ImpPtr[dy].Pixel^.R;
           end;
         end;
-        if Sum < MaxSum then begin // no saturation
-          CoalPtr.SetX(ScaleToVcl(xCoal) + x);
-          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
+        if sum < MaxSum then begin // no saturation
+          CoalPtr.SetX(ScaleToNative(xCoal) + x);
+          sum := 1 shl 22 - (MaxSum - sum) * (256 - CoalPtr.Pixel^.B * 2);
           PaintPtr.SetX(x0 + x);
-          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * Sum shr 22;
-          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * Sum shr 22;
-          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * Sum shr 22;
+          PaintPtr.Pixel^.B := PaintPtr.Pixel^.B * sum shr 22;
+          PaintPtr.Pixel^.G := PaintPtr.Pixel^.G * sum shr 22;
+          PaintPtr.Pixel^.R := PaintPtr.Pixel^.R * sum shr 22;
         end;
       end;