Changeset 246 for branches/highdpi/LocalPlayer/Wonders.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/Wonders.pas (modified) (3 diffs)

branches/highdpi/LocalPlayer/Wonders.pas

@@ -87 +87 @@
 procedure TWondersDlg.PaintBackgroundShape;
 const
-  darken = 24;
+  Darken = 24;
   // space=pi/120;
   amax0 = 15734; // 1 shl 16*tan(pi/12-space);
@@ -103 +103 @@
   C: Integer;
   Ch: Integer;
-  Line: array [0..1] of TPixelPointer;
+  Line: array [0..3] of TPixelPointer;
   Width: Integer;
   Height: Integer;
-  CenterNative: TPoint;
-begin
-  Width := ScaleToVcl(180);
-  Height := ScaleToVcl(128);
-  CenterNative := ScalePointtoVcl(Center);
+begin
+  Width := ScaleToNative(180);
+  Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen);
-  Line[1] := PixelPointer(Offscreen);
+  Line[0] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y));
+  Line[1] := PixelPointer(Offscreen, ScaleToNative(Center.X), ScaleToNative(Center.Y) - 1);
+  Line[2] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y));
+  Line[3] := PixelPointer(Offscreen, ScaleToNative(Center.X) - 1, ScaleToNative(Center.Y) - 1);
   for Y := 0 to Height - 1 do begin
     for X := 0 to Width - 1 do begin
       r := X * X * ((Height div 4) * (Height div 4)) + Y * Y * ((Width div 4) * (Width div 4));
       ax := ((1 shl 16 div (Height div 4)) * (Width div 4)) * Y;
-      if (r < ScaleToVcl(8) * Height * Width * Width) and
+      if (r < ScaleToNative(8) * Height * Width * Width) and
         ((r >= (Height div 4) * (Height div 2) * (Width div 2) * (Width div 2)) and (ax < amax2 * X) and
         ((ax < amax0 * X) or (ax > amin2 * X)) or (ax > amin1 * X) and
-        ((ax < amax1 * X) or (ax > amin3 * X))) then
-        for i := 0 to 1 do
-          for ch := 0 to 2 do begin
-            Line[0].SetXY(CenterNative.X + X, CenterNative.Y + Y);
-            Line[1].SetXY(CenterNative.X + X, CenterNative.Y - 1 - Y);
-            c := Line[i].Pixel^.Planes[ch] - darken;
-            if c < 0 then Line[i].Pixel^.Planes[ch] := 0
-              else Line[i].Pixel^.Planes[ch] := c;
-            Line[0].SetXY(CenterNative.X - 1 - X, CenterNative.Y + Y);
-            Line[1].SetXY(CenterNative.X - 1 - X, CenterNative.Y - 1 - Y);
-            c := Line[i].Pixel^.Planes[ch] - darken;
-            if c < 0 then Line[i].Pixel^.Planes[ch] := 0
-              else Line[i].Pixel^.Planes[ch] := c;
-          end;
-    end;
+        ((ax < amax1 * X) or (ax > amin3 * X))) then begin
+        for ch := 0 to 2 do begin
+          c := Line[0].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[0].Pixel^.Planes[ch] := 0
+            else Line[0].Pixel^.Planes[ch] := c;
+          c := Line[1].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[1].Pixel^.Planes[ch] := 0
+            else Line[1].Pixel^.Planes[ch] := c;
+          c := Line[2].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[2].Pixel^.Planes[ch] := 0
+            else Line[2].Pixel^.Planes[ch] := c;
+          c := Line[3].Pixel^.Planes[ch] - Darken;
+          if c < 0 then Line[3].Pixel^.Planes[ch] := 0
+            else Line[3].Pixel^.Planes[ch] := c;
+        end;
+      end;
+      Line[0].NextPixel;
+      Line[1].NextPixel;
+      Line[2].PreviousPixel;
+      Line[3].PreviousPixel;
+    end;
+    Line[0].NextLine;
+    Line[1].PreviousLine;
+    Line[2].NextLine;
+    Line[3].PreviousLine;
   end;
   Offscreen.EndUpdate;
@@ -150 +160 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-
-  Src := PixelPointer(BigImp, ScaleToVcl(x0Src), ScaleToVcl(y0Src));
-  Dst := PixelPointer(Offscreen, ScaleToVcl(x0Dst), ScaleToVcl(y0Dst));
-  for Y := 0 to ScaleToVcl(ySizeBig) - 1 do begin
-    for X := 0 to ScaleToVcl(xSizeBig) - 1 do begin
+  Src := PixelPointer(BigImp, ScaleToNative(x0Src), ScaleToNative(y0Src));
+  Dst := PixelPointer(Offscreen, ScaleToNative(x0Dst), ScaleToNative(y0Dst));
+  for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
+    for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
       Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
         15 + (255 - Src.Pixel^.R) * 9) div 128;