Changeset 230 for trunk

Timestamp:

May 14, 2020, 10:39:45 PM (5 years ago)

Author:

chronos

Message:

• Modified: Optimized drawing in Wonders window.

Location:

trunk

Files:

• LocalPlayer/Wonders.pas (modified) (4 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)
• Packages/CevoComponents/UPixelPointer.pas (modified) (2 diffs)

trunk/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;
 begin
   Offscreen.BeginUpdate;
-  Line[0] := PixelPointer(Offscreen);
-  Line[1] := PixelPointer(Offscreen);
+  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
@@ -115 +117 @@
         ((r >= 32 * 64 * 90 * 90) 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);
-            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);
-            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;
@@ -217 +229 @@
               ySizeBig + 6, (wMaintexture - ClientWidth) div 2,
               (hMaintexture - ClientHeight) div 2);
-            DarkIcon(I);
+            //DarkIcon(I);
           end;
         -2: // destroyed

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -911 +911 @@
 begin
   dst.BeginUpdate;
-  DstPtr := PixelPointer(dst, x0, y0);
+  DstPtr := PixelPointer(dst, x0 - GlowRange + 1, y0 - GlowRange + 1);
   for y := -GlowRange + 1 to Height - 1 + GlowRange - 1 do begin
     for x := -GlowRange + 1 to Width - 1 + GlowRange - 1 do begin
-      DstPtr.SetXY(x, y);
       if x < 0 then
         if y < 0 then
@@ -933 +932 @@
       else if y >= Height then
         r := y - (Height - 1)
-      else
+      else begin
+        DstPtr.NextPixel;
         continue;
+      end;
       if r = 0 then
         r := 1;
@@ -942 +943 @@
             (DstPtr.Pixel^.Planes[2 - ch] * (r - 1) + (cl shr (8 * ch) and $FF) *
             (GlowRange - r)) div (GlowRange - 1);
-    end;
+      DstPtr.NextPixel;
+    end;
+    DstPtr.NextLine;
   end;
   dst.EndUpdate;

trunk/Packages/CevoComponents/UPixelPointer.pas

@@ -27 +27 @@
     BytesPerPixel: Integer;
     BytesPerLine: Integer;
-    procedure NextLine; inline; // Move pointer to start of new base line
+    procedure NextLine; inline; // Move pointer to start of next line
+    procedure PreviousLine; inline; // Move pointer to start of previous line
     procedure NextPixel; inline; // Move pointer to next pixel
+    procedure PreviousPixel; inline; // Move pointer to previous pixel
     procedure SetXY(X, Y: Integer); inline; // Set pixel position relative to base
     procedure SetX(X: Integer); inline; // Set horizontal pixel position relative to base
@@ -47 +49 @@
 end;
 
+procedure TPixelPointer.PreviousLine;
+begin
+  Line := Pointer(Line) - BytesPerLine;
+  Pixel := Line;
+end;
+
 procedure TPixelPointer.NextPixel; inline;
 begin
   Pixel := Pointer(Pixel) + BytesPerPixel;
+end;
+
+procedure TPixelPointer.PreviousPixel;
+begin
+  Pixel := Pointer(Pixel) - BytesPerPixel;
 end;