Changeset 210 for branches/highdpi/LocalPlayer/Wonders.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

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

branches/highdpi/LocalPlayer/Wonders.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
+  UDpiControls, ScreenTools, BaseWin, Protocol, LCLIntf, LCLType, SysUtils, Classes, Graphics,
   Controls, Forms, ButtonB;
 
@@ -38 +38 @@
 
 uses
-  Term, ClientTools, Help, Tribes, UDpiControls;
+  Term, ClientTools, Help, Tribes, UPixelPointer;
 
 {$R *.lfm}
@@ -104 +104 @@
   Ch: Integer;
   Line: array [0..1] of TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+  CenterNative: TPoint;
+begin
+  Width := ScaleToVcl(180);
+  Height := ScaleToVcl(128);
+  CenterNative := ScalePointtoVcl(Center);
   Offscreen.BeginUpdate;
-  Line[0].Init(Offscreen);
-  Line[1].Init(Offscreen);
-  for Y := 0 to 127 do begin
-    for X := 0 to 179 do begin
-      r := X * X * (32 * 32) + Y * Y * (45 * 45);
-      ax := ((1 shl 16 div 32) * 45) * Y;
-      if (r < 8 * 128 * 180 * 180) and
-        ((r >= 32 * 64 * 90 * 90) and (ax < amax2 * X) and
+  Line[0] := PixelPointer(Offscreen);
+  Line[1] := PixelPointer(Offscreen);
+  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
+        ((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(Center.X + X, Center.Y + Y);
-            Line[1].SetXY(Center.X + X, Center.Y - 1 - Y);
+            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(Center.X - 1 - X, Center.Y + Y);
-            Line[1].SetXY(Center.X - 1 - X, Center.Y - 1 - Y);
+            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
@@ -144 +150 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src.Init(BigImp, x0Src, y0Src);
-  Dst.Init(Offscreen, x0Dst, y0Dst);
-  for Y := 0 to ySizeBig - 1 do begin
-    for X := 0 to xSizeBig - 1 do begin
+
+  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
       Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
         15 + (255 - Src.Pixel^.R) * 9) div 128;
@@ -238 +245 @@
     begin
       case MyRO.Wonder[I].CityID of
-        - 1: // not built yet
+        -1: // not built yet
           begin
             Fill(Offscreen.Canvas, Center.X - xSizeBig div 2 + RingPosition[I].X - 3,
@@ -249 +256 @@
           begin
             HaveWonder := True;
-            DpiBitBlt(Offscreen.Canvas.Handle,
+            DpiBitCanvas(Offscreen.Canvas,
               Center.X - xSizeBig div 2 + RingPosition[I].X,
               Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig,
-              ySizeBig, BigImp.Canvas.Handle, 0, (SystemIconLines + 3) *
-              ySizeBig, SRCCOPY);
+              ySizeBig, BigImp.Canvas, 0, (SystemIconLines + 3) *
+              ySizeBig);
           end;
       else
         begin
           HaveWonder := True;
-          DpiBitBlt(Offscreen.Canvas.Handle,
+          DpiBitCanvas(Offscreen.Canvas,
             Center.X - xSizeBig div 2 + RingPosition[I].X,
             Center.Y - ySizeBig div 2 + RingPosition[I].Y, xSizeBig, ySizeBig,
-            BigImp.Canvas.Handle, (I mod 7) * xSizeBig,
-            (I div 7 + SystemIconLines) * ySizeBig, SRCCOPY);
+            BigImp.Canvas, (I mod 7) * xSizeBig,
+            (I div 7 + SystemIconLines) * ySizeBig);
         end;
       end;