Changeset 72 for trunk/Start.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Unified direct pixel access using TPixelPointer.

File:

• trunk/Start.pas (modified) (8 diffs)

trunk/Start.pas

@@ -822 +822 @@
 var
   x, y: integer;
-  PicturePixel: PPixel32;
+  PicturePixel: TPixelPointer;
 begin
   SetMainTextureByAge(-1);
@@ -830 +830 @@
   Fill(EmptyPicture.Canvas, 0, 0, 64, 64, (wMaintexture - 64) div 2,
     (hMaintexture - 64) div 2);
-  for y := 0 to 63 do
-  begin // darken texture for empty slot
-    for x := 0 to 64 - 1 do
-    begin
-      PicturePixel := GetBitmapPixelPtr(EmptyPicture, x, y);
-      PicturePixel^.B := Max(PicturePixel^.B - 28, 0);
-      PicturePixel^.G := Max(PicturePixel^.G - 28, 0);
-      PicturePixel^.R := Max(PicturePixel^.R - 28, 0);
-    end
+  // darken texture for empty slot
+  PicturePixel.Init(EmptyPicture);
+  for y := 0 to 63 do begin
+    for x := 0 to 64 - 1 do begin
+      PicturePixel.Pixel^.B := Max(PicturePixel.Pixel^.B - 28, 0);
+      PicturePixel.Pixel^.G := Max(PicturePixel.Pixel^.G - 28, 0);
+      PicturePixel.Pixel^.R := Max(PicturePixel.Pixel^.R - 28, 0);
+      PicturePixel.NextPixel;
+    end;
+    PicturePixel.NextLine;
   end;
   EmptyPicture.EndUpdate;
@@ -1001 +1002 @@
   var
     i, x, y, xm, cm: integer;
-    MiniPixel: PPixel32;
+    MiniPixel: TPixelPointer;
     Map: ^TTileList;
   begin
@@ -1011 +1012 @@
     Mini.SetSize(MiniWidth * 2, MiniHeight);
     Mini.BeginUpdate;
+    MiniPixel.Init(Mini);
     for y := 0 to MiniHeight - 1 do begin
       for x := 0 to MiniWidth - 1 do begin
         for i := 0 to 1 do begin
           xm := (x * 2 + i + y and 1) mod (MiniWidth * 2);
-          MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
+          MiniPixel.SetX(xm);
           cm := MiniColors
             [Map[x * lxmax div MiniWidth + lxmax *
             ((y * (lymax - 1) + MiniHeight div 2) div (MiniHeight - 1))] and
             fTerrain, i];
-          MiniPixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
-          MiniPixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
-          MiniPixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
+          MiniPixel.Pixel^.B := ((cm shr 16) and $FF) * Brightness div 3;
+          MiniPixel.Pixel^.G := ((cm shr 8) and $FF) * Brightness div 3;
+          MiniPixel.Pixel^.R := ((cm shr 0) and $FF) * Brightness div 3;
         end;
       end;
+      MiniPixel.NextLine;
     end;
     Mini.EndUpdate;
@@ -1035 +1038 @@
   var
     i, x, y, xm, cm, Tile, OwnColor, EnemyColor: integer;
-    MiniPixel, PrevMiniPixel: PPixel32;
+    MiniPixel, PrevMiniPixel: TPixelPointer;
   begin
     OwnColor := GrExt[HGrSystem].Data.Canvas.Pixels[95, 67];
@@ -1045 +1048 @@
     begin
       Mini.BeginUpdate;
+      MiniPixel.Init(Mini);
+      PrevMiniPixel.Init(Mini, 0, -1);
       for y := 0 to MiniHeight - 1 do begin
         for x := 0 to MiniWidth - 1 do begin
           for i := 0 to 1 do begin
             xm := (x * 2 + i + y and 1) mod (MiniWidth * 2);
-            MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
+            MiniPixel.SetX(xm);
             Tile := SaveMap[x + MiniWidth * y];
             if Tile and fTerrain = fUNKNOWN then
@@ -1061 +1066 @@
               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.SetX(xm);
+                PrevMiniPixel.Pixel^.B := cm shr 16;
+                PrevMiniPixel.Pixel^.G:= cm shr 8 and $FF;
+                PrevMiniPixel.Pixel^.R := cm and $FF;
               end
             end
@@ -1074 +1079 @@
             else
               cm := MiniColors[Tile and fTerrain, i];
-            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;