Changeset 245 for trunk/LocalPlayer

Timestamp:

May 21, 2020, 7:58:42 PM (5 years ago)

Author:

chronos

Message:

• Added: Inactive scaling functions for future HighDPI support.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (3 diffs)
• IsoEngine.pas (modified) (6 diffs)
• MessgEx.pas (modified) (2 diffs)
• Term.pas (modified) (2 diffs)
• Wonders.pas (modified) (3 diffs)

trunk/LocalPlayer/Help.pas

@@ -441 +441 @@
 const
   nHeaven = 28;
-  maxsum = 9 * 9 * 255 * 75 div 100;
+  MaxSum = 9 * 9 * 255 * 75 div 100;
 var
   x, y, dx, dy, xSrc, ySrc, sum, xx: integer;
@@ -457 +457 @@
   xSrc := iix mod 7 * xSizeBig;
   ySrc := (iix div 7 + 1) * ySizeBig;
-  for y := 0 to ySizeBig * 2 - 1 do
-    if ((y0 + y) >= 0) and ((y0 + y) < InnerHeight) then begin
-      PaintPtr := PixelPointer(OffScreen, 0, y0 + y);
-      CoalPtr := PixelPointer(Templates, 0, 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 + dy, 0) shr 1) >= 0) and ((Max(y + dy, 0) shr 1) < ySizeBig) then
-          ImpPtr[dy] := PixelPointer(BigImp, 0, ySrc + (Max(y + dy, 0) shr 1));
-      for x := 0 to xSizeBig * 2 - 1 do begin
+        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 := xSrc + Max((x + 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 + dy) shr 1 < 0) or ((y + dy) shr 1 >= ySizeBig) or
-              ((x + dx) shr 1 < 0) or ((x + dx) shr 1 >= xSizeBig) or
-              ((y + dy) shr 1 < 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[(y + dy) shr 1]) then
+              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(y) + dy) shr 1]) then
               sum := sum + 9 * 255
             else
@@ -481 +481 @@
           end;
         end;
-        if sum < maxsum then begin // no saturation
-          CoalPtr.SetX(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;

trunk/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: TBitmap;
@@ -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, ScaleToNative(0), ScaleToNative(p1 * (yyt * 2)));
+          for dy := 0 to ScaleToNative(yyt * 2) - 1 do begin
+            for dx := 0 to ScaleToNative(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;
+  Line := PixelPointer(FOutput, ScaleToNative(x0), ScaleToNative(y0));
+  for y := 0 to ScaleToNative(Height) - 1 do begin
+    y_n := (ScaleFromNative(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);
+      Line.SetX(0);
+      MakeDark(@Line, ScaleToNative(xm - wBright));
+      Line.SetX(ScaleToNative(xm + wBright));
+      MakeDark(@Line, ScaleToNative(Width - xm - wBright));
     end else begin
       // Darken entire line
-      Line.SetX(x0);
-      MakeDark(@Line, x1 - x0);
+      Line.SetX(0);
+      MakeDark(@Line, ScaleToNative(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

trunk/LocalPlayer/MessgEx.pas

@@ -237 +237 @@
   Screwed: array [0 .. wScrewed - 1, 0 .. hScrewed - 1, 0 .. 3] of single;
   SrcPtr: TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+begin
+  Width := 56;
+  Height := 40;
   if IconIndex >= 0 then begin
     xIcon := IconIndex mod 7 * xSizeBig;
     yIcon := (IconIndex + SystemIconLines * 7) div 7 * ySizeBig;
     // prepare screwed icon
-    fillchar(Screwed, sizeof(Screwed), 0);
+    FillChar(Screwed, sizeof(Screwed), 0);
     BigImp.BeginUpdate;
-    for iy := 0 to 39 do begin
-      for ix := 0 to 55 do begin
-        SrcPtr := PixelPointer(BigImp, ix + xIcon, iy + yIcon);
-        xR := ix * (37 + iy * 5 / 40) / 56;
+    SrcPtr := PixelPointer(BigImp, ScaleToNative(xIcon), ScaleToNative(yIcon));
+    for iy := 0 to ScaleToNative(Height) - 1 do begin
+      for ix := 0 to ScaleToNative(Width) - 1 do begin
+        xR := ScaleFromNative(ix) * (37 + ScaleFromNative(iy) * 5 / Height) / Width;
         xDst := Trunc(xR);
         xR := Frac(xR);
-        x1 := (120 - ix) * (120 - ix) - 10000;
-        yR := iy * 18 / 40 + x1 * x1 / 4000000;
+        x1 := (120 - ScaleFromNative(ix)) * (120 - ScaleFromNative(ix)) - 10000;
+        yR := ScaleFromNative(iy) * 18 / Height + x1 * x1 / 4000000;
         yDst := Trunc(yR);
         yR := Frac(yR);
@@ -272 +276 @@
             Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
               3] + share;
-          end;
-      end;
+        end;
+        SrcPtr.NextPixel;
+      end;
+      SrcPtr.NextLine;
     end;
     BigImp.EndUpdate;

trunk/LocalPlayer/Term.pas

@@ -554 +554 @@
   Sharpen = 80;
 type
-  TBuffer = array [0 .. 99999, 0 .. 2] of integer;
+  TBuffer = array [0 .. 99999, 0 .. 2] of Integer;
 var
-  sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch, xdivider,
-    ydivider: integer;
-  resampled: ^TBuffer;
+  Sum, Cnt, dx, dy, nx, ny, ix, iy, ir, x, y, c, ch: Integer;
+  xdivider, ydivider: Integer;
+  Resampled: ^TBuffer;
   PixelPtr: TPixelPointer;
 begin
-  nx := BigImp.width div xSizeBig * xSizeSmall;
-  ny := BigImp.height div ySizeBig * ySizeSmall;
+  nx := BigImp.Width div xSizeBig * xSizeSmall;
+  ny := BigImp.Height div ySizeBig * ySizeSmall;
 
   // resample icons
-  GetMem(resampled, nx * ny * 12);
-  FillChar(resampled^, nx * ny * 12, 0);
+  GetMem(Resampled, nx * ny * 12);
+  FillChar(Resampled^, nx * ny * 12, 0);
   BigImp.BeginUpdate;
-  for ix := 0 to BigImp.width div xSizeBig - 1 do
-    for iy := 0 to BigImp.height div ySizeBig - 1 do
-      for y := 0 to ySizeBig - 2 * cut - 1 do
-      begin
-        ydivider := (y * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
-          (ySizeBig - 2 * cut) - y * ySizeSmall;
+  for ix := 0 to BigImp.Width div xSizeBig - 1 do
+    for iy := 0 to BigImp.Height div ySizeBig - 1 do begin
+      PixelPtr := PixelPointer(BigImp, ScaleToNative(ix * xSizeBig),
+        ScaleToNative(cut + iy * ySizeBig));
+      for y := 0 to ScaleToNative(ySizeBig - 2 * cut) - 1 do begin
+        ydivider := (ScaleFromNative(y) * ySizeSmall div (ySizeBig - 2 * cut) + 1) *
+          (ySizeBig - 2 * cut) - ScaleFromNative(y) * ySizeSmall;
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        PixelPtr := PixelPointer(BigImp, 0, cut + iy * ySizeBig + y);
-        for x := 0 to xSizeBig - 1 do
-        begin
-          ir := ix * xSizeSmall + iy * nx * ySizeSmall + x *
-            xSizeSmall div xSizeBig + y *
+        for x := 0 to ScaleToNative(xSizeBig) - 1 do begin
+          ir := ix * xSizeSmall + iy * nx * ySizeSmall + ScaleFromNative(x) *
+            xSizeSmall div xSizeBig + ScaleFromNative(y) *
             ySizeSmall div (ySizeBig - 2 * cut) * nx;
-          xdivider := (x * xSizeSmall div xSizeBig + 1) * xSizeBig - x *
-            xSizeSmall;
+          xdivider := (ScaleFromNative(x) * xSizeSmall div xSizeBig + 1) *
+            xSizeBig - ScaleFromNative(x) * xSizeSmall;
           if xdivider > xSizeSmall then
             xdivider := xSizeSmall;
-          for ch := 0 to 2 do
-          begin
-            PixelPtr.SetX(ix * xSizeBig + x);
+          for ch := 0 to 2 do begin
             c := PixelPtr.Pixel^.Planes[ch];
-            inc(resampled[ir, ch], c * xdivider * ydivider);
+            Inc(Resampled[ir, ch], c * xdivider * ydivider);
             if xdivider < xSizeSmall then
-              inc(resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + 1, ch], c * (xSizeSmall - xdivider) *
                 ydivider);
             if ydivider < ySizeSmall then
-              inc(resampled[ir + nx, ch],
+              Inc(Resampled[ir + nx, ch],
                 c * xdivider * (ySizeSmall - ydivider));
             if (xdivider < xSizeSmall) and (ydivider < ySizeSmall) then
-              inc(resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
+              Inc(Resampled[ir + nx + 1, ch], c * (xSizeSmall - xdivider) *
                 (ySizeSmall - ydivider));
           end;
+          PixelPtr.NextPixel;
         end;
+        PixelPtr.NextLine;
       end;
+    end;
   BigImp.EndUpdate;
 
-  // sharpen resampled icons
+  // Sharpen Resampled icons
   SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
-  for y := 0 to ny - 1 do begin
-    PixelPtr := PixelPointer(SmallImp, 0, y);
-    for x := 0 to nx - 1 do
+  PixelPtr := PixelPointer(SmallImp);
+  for y := 0 to ScaleToNative(ny) - 1 do begin
+    for x := 0 to ScaleToNative(nx) - 1 do begin
       for ch := 0 to 2 do begin
-        sum := 0;
+        Sum := 0;
         Cnt := 0;
         for dy := -1 to 1 do
-          if ((dy >= 0) or (y mod ySizeSmall > 0)) and
-            ((dy <= 0) or (y mod ySizeSmall < ySizeSmall - 1)) then
+          if ((dy >= 0) or (ScaleFromNative(y) mod ySizeSmall > 0)) and
+            ((dy <= 0) or (ScaleFromNative(y) mod ySizeSmall < ySizeSmall - 1)) then
             for dx := -1 to 1 do
-              if ((dx >= 0) or (x mod xSizeSmall > 0)) and
-                ((dx <= 0) or (x mod xSizeSmall < xSizeSmall - 1)) then
+              if ((dx >= 0) or (ScaleFromNative(x) mod xSizeSmall > 0)) and
+                ((dx <= 0) or (ScaleFromNative(x) mod xSizeSmall < xSizeSmall - 1)) then
               begin
-                inc(sum, resampled[x + dx + nx * (y + dy), ch]);
-                inc(Cnt);
+                Inc(Sum, Resampled[ScaleFromNative(x) + dx + nx * (ScaleFromNative(y) + dy), ch]);
+                Inc(Cnt);
               end;
-        sum := ((Cnt * Sharpen + 800) * resampled[x + nx * y, ch] - sum *
+        Sum := ((Cnt * Sharpen + 800) * Resampled[ScaleFromNative(x) + nx * ScaleFromNative(y), ch] - Sum *
           Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
-        if sum < 0 then sum := 0;
-        if sum > 255 then sum := 255;
-        PixelPtr.SetX(x);
-        PixelPtr.Pixel^.Planes[ch] := sum;
+        if Sum < 0 then Sum := 0;
+        if Sum > 255 then Sum := 255;
+        PixelPtr.Pixel^.Planes[ch] := Sum;
       end;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
   end;
   SmallImp.EndUpdate;
-  FreeMem(resampled);
+  FreeMem(Resampled);
 end;
 
@@ -4066 +4068 @@
   MiniPixel := PixelPointer(Mini);
   PrevMiniPixel := PixelPointer(Mini);
-  for y := 0 to G.ly - 1 do
-  begin
-    for x := 0 to G.lx - 1 do
-      if MyMap[x + G.lx * y] and fTerrain <> fUNKNOWN then
-      begin
-        Loc := x + G.lx * y;
+  for y := 0 to ScaleToNative(G.ly) - 1 do
+  begin
+    for x := 0 to ScaleToNative(G.lx) - 1 do
+      if MyMap[ScaleFromNative(x) + G.lx * ScaleFromNative(y)] and fTerrain <> fUNKNOWN then
+      begin
+        Loc := ScaleFromNative(x) + G.lx * ScaleFromNative(y);
         for i := 0 to 1 do
         begin
-          xm := ((x - xwMini) * 2 + i + y and 1 - hw + G.lx * 5) mod (G.lx * 2);
+          xm := ((x - ScaleToNative(xwMini)) * 2 + i + y and 1 - ScaleToNative(hw) +
+            ScaleToNative(G.lx) * 5) mod (ScaleToNative(G.lx) * 2);
           MiniPixel.SetXY(xm, y);
           cm := MiniColors[MyMap[Loc] and fTerrain, i];

trunk/LocalPlayer/Wonders.pas

@@ -104 +104 @@
   Ch: Integer;
   Line: array [0..3] of TPixelPointer;
-begin
+  Width: Integer;
+  Height: Integer;
+begin
+  Width := ScaleToNative(180);
+  Height := ScaleToNative(128);
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen, Center.X, Center.Y);
-  Line[1] := PixelPointer(Offscreen, Center.X, Center.Y - 1);
-  Line[2] := PixelPointer(Offscreen, Center.X - 1, Center.Y);
-  Line[3] := PixelPointer(Offscreen, Center.X - 1, Center.Y - 1);
-  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, 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 < 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 begin
@@ -156 +160 @@
   x0Src := (i mod 7) * xSizeBig;
   y0Src := (i div 7 + SystemIconLines) * ySizeBig;
-  Src := PixelPointer(BigImp, x0Src, y0Src);
-  Dst := PixelPointer(Offscreen, x0Dst, y0Dst);
-  for Y := 0 to ySizeBig - 1 do begin
-    for X := 0 to 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;
@@ -229 +233 @@
               ySizeBig + 6, (wMaintexture - ClientWidth) div 2,
               (hMaintexture - ClientHeight) div 2);
-            //DarkIcon(I);
+            DarkIcon(I);
           end;
         -2: // destroyed