Changeset 72 for trunk/LocalPlayer

Timestamp:

Jan 15, 2017, 11:47:01 AM (8 years ago)

Author:

chronos

Message:

• Modified: Unified direct pixel access using TPixelPointer.

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (1 diff)
• TechTree.pas (modified) (2 diffs)
• Term.pas (modified) (5 diffs)
• Wonders.pas (modified) (5 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -438 +438 @@
     XX, YY: Integer;
     Gray: Integer;
-    PixelPtr: PPixel32;
-    LinePtr: PPixel32;
+    PixelPtr: TPixelPointer;
   begin
     Offscreen.BeginUpdate;
-    LinePtr := GetBitmapPixelPtr(Offscreen, X, Y);
+    PixelPtr.Init(Offscreen, X, Y);
     for YY := 0 to h - 1 do begin
-      PixelPtr := LinePtr;
       for XX := 0 to w - 1 do begin
-        Gray := (Integer(PixelPtr^.B) + Integer(PixelPtr^.G) + Integer(PixelPtr^.R)
-          ) * 85 shr 8;
-        PixelPtr^.B := 0;
-        PixelPtr^.G := 0;
-        PixelPtr^.R := Gray; // 255-(255-gray) div 2;
-        PixelPtr := Pointer(PixelPtr) + (Offscreen.RawImage.Description.BitsPerPixel shr 3);
+        Gray := (Integer(PixelPtr.Pixel^.B) + Integer(PixelPtr.Pixel^.G) +
+        Integer(PixelPtr.Pixel^.R)) * 85 shr 8;
+        PixelPtr.Pixel^.B := 0;
+        PixelPtr.Pixel^.G := 0;
+        PixelPtr.Pixel^.R := Gray; // 255-(255-gray) div 2;
+        PixelPtr.NextPixel;
       end;
-      LinePtr := Pointer(LinePtr) + Offscreen.RawImage.Description.BytesPerLine;
+      PixelPtr.NextLine;
     end;
     Offscreen.EndUpdate;

trunk/LocalPlayer/TechTree.pas

@@ -123 +123 @@
   X, Y, ad, TexWidth, TexHeight: Integer;
   s: string;
-  SrcPixel, DstPixel: PPixel32;
+  SrcPixel, DstPixel: TPixelPointer;
 begin
   if Image = nil then
@@ -165 +165 @@
     // texturize background
     Image.BeginUpdate;
-    TexWidth := Paper.width;
-    TexHeight := Paper.height;
-    for Y := 0 to Image.height - 1 do
-    begin
-      for X := 0 to Image.width - 1 do
-      begin
-        DstPixel := GetBitmapPixelPtr(Image, X, Y);
-        if (DstPixel^.ARGB and $FFFFFF) = $7F007F then // transparent
-        begin
-          SrcPixel := GetBitmapPixelPtr(Paper, X mod TexWidth, Y mod TexHeight);
-          DstPixel^.B := SrcPixel^.B;
-          DstPixel^.G := SrcPixel^.G;
-          DstPixel^.R := SrcPixel^.R;
+    TexWidth := Paper.Width;
+    TexHeight := Paper.Height;
+    DstPixel.Init(Image);
+    SrcPixel.Init(Paper);
+    for Y := 0 to Image.Height - 1 do begin
+      for X := 0 to Image.Width - 1 do begin
+        if (DstPixel.Pixel^.ARGB and $FFFFFF) = $7F007F then begin // transparent
+          SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
+          DstPixel.Pixel^.B := SrcPixel.Pixel^.B;
+          DstPixel.Pixel^.G := SrcPixel.Pixel^.G;
+          DstPixel.Pixel^.R := SrcPixel.Pixel^.R;
         end;
+        DstPixel.NextPixel;
       end;
+      DstPixel.NextLine;
     end;
     Image.EndUpdate;

trunk/LocalPlayer/Term.pas

@@ -4054 +4054 @@
 var
   uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel, MiniPixel: PPixel32;
+  PrevMiniPixel, MiniPixel: TPixelPointer;
 begin
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
@@ -4065 +4065 @@
   end;
   Mini.BeginUpdate;
+  MiniPixel.Init(Mini);
+  PrevMiniPixel.Init(Mini);
   for y := 0 to G.ly - 1 do
   begin
@@ -4074 +4076 @@
         begin
           xm := ((x - xwMini) * 2 + i + y and 1 - hw + G.lx * 5) mod (G.lx * 2);
-          MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
+          MiniPixel.SetXY(xm, y);
           cm := MiniColors[MyMap[Loc] and fTerrain, i];
           if ClientMode = cEditMap then
@@ -4099 +4101 @@
             if y > 0 then begin
               // 2x2 city dot covers two lines
-              PrevMiniPixel := GetBitmapPixelPtr(Mini, xm, y - 1);
-              PrevMiniPixel^.B := cm shr 16;
-              PrevMiniPixel^.G := cm shr 8 and $FF;
-              PrevMiniPixel^.R := cm and $FF;
+              PrevMiniPixel.SetXY(xm, y - 1);
+              PrevMiniPixel.Pixel^.B := cm shr 16;
+              PrevMiniPixel.Pixel^.G := cm shr 8 and $FF;
+              PrevMiniPixel.Pixel^.R := cm and $FF;
             end
           end
@@ -4131 +4133 @@
               cm := Tribe[MyRO.Territory[Loc]].Color;
           end;
-          MiniPixel^.B := cm shr 16;
-          MiniPixel^.G := cm shr 8 and $FF;
-          MiniPixel^.R := cm and $FF;
+          MiniPixel.Pixel^.B := cm shr 16;
+          MiniPixel.Pixel^.G := cm shr 8 and $FF;
+          MiniPixel.Pixel^.R := cm and $FF;
         end;
       end;

trunk/LocalPlayer/Wonders.pas

@@ -82 +82 @@
   var
     X, Y, ch, x0Dst, y0Dst, x0Src, y0Src, darken, c: Integer;
-    Src, Dst: PPixel32;
+    Src, Dst: TPixelPointer;
   begin
     x0Dst := ClientWidth div 2 - xSizeBig div 2 + RingPosition[i, 0];
@@ -88 +88 @@
     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 := GetBitmapPixelPtr(BigImp, x0Src + X, y0Src + Y);
-        Dst := GetBitmapPixelPtr(Offscreen, x0Dst + X, y0Dst + Y);
-        darken := ((255 - Src^.B) * 3 + (255 - Src^.G) *
-          15 + (255 - Src^.R) * 9) div 128;
+        Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
+          15 + (255 - Src.Pixel^.R) * 9) div 128;
         for ch := 0 to 2 do begin
-          c := Dst^.Planes[ch] - darken;
-          if c < 0 then Dst^.Planes[ch] := 0
-            else Dst^.Planes[ch] := c;
-        end
-      end
+          c := Dst.Pixel^.Planes[ch] - Darken;
+          if c < 0 then Dst.Pixel^.Planes[ch] := 0
+            else Dst.Pixel^.Planes[ch] := c;
+        end;
+        Src.NextPixel;
+        Dst.NextPixel;
+      end;
+      Src.NextLine;
+      Dst.NextLine;
     end;
   end;
@@ -122 +126 @@
   i, X, Y, r, ax, ch, c: Integer;
   HaveWonder: boolean;
-  Line: array [0 .. 1] of PPixel32;
+  Line: array [0..1] of TPixelPointer;
   s: string;
 begin
@@ -153 +157 @@
   xm := ClientWidth div 2;
   ym := ClientHeight div 2;
+  Line[0].Init(Offscreen);
+  Line[1].Init(Offscreen);
   for Y := 0 to 127 do begin
     for X := 0 to 179 do begin
@@ -163 +169 @@
         for i := 0 to 1 do
           for ch := 0 to 2 do begin
-            Line[0] := GetBitmapPixelPtr(Offscreen, xm + X, ym + Y);
-            Line[1] := GetBitmapPixelPtr(Offscreen, xm + X, ym - 1 - Y);
-            c := Line[i]^.Planes[ch] - darken;
-            if c < 0 then
-              Line[i]^.Planes[ch] := 0
-            else
-              Line[i]^.Planes[ch] := c;
-            Line[0] := GetBitmapPixelPtr(Offscreen, xm - 1 - X, ym + Y);
-            Line[1] := GetBitmapPixelPtr(Offscreen, xm - 1 - X, ym - 1 - Y);
-            c := Line[i]^.Planes[ch] - darken;
-            if c < 0 then
-              Line[i]^.Planes[ch] := 0
-            else
-              Line[i]^.Planes[ch] := c;
+            Line[0].SetXY(xm + X, ym + Y);
+            Line[1].SetXY(xm + X, ym - 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(xm - 1 - X, ym + Y);
+            Line[1].SetXY(xm - 1 - X, ym - 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;