Changeset 52 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 11, 2017, 10:14:11 PM (7 years ago)

Author:

chronos

Message:

• Fixed: More Bitmap.ScanLine replaced by direct access to RAWImage data.

File:

• trunk/LocalPlayer/Term.pas (modified) (11 diffs)

trunk/LocalPlayer/Term.pas

@@ -506 +506 @@
   Sharpen = 80;
 type
-  TLine = array [0 .. 99999, 0 .. 2] of Byte;
   TBuffer = array [0 .. 99999, 0 .. 2] of integer;
 var
@@ -512 +511 @@
     ydivider: integer;
   resampled: ^TBuffer;
-  line: ^TLine;
+  PixelPtr: TPixelPointer;
 begin
   nx := BigImp.width div xSizeBig * xSizeSmall;
@@ -529 +528 @@
         if ydivider > ySizeSmall then
           ydivider := ySizeSmall;
-        line := BigImp.ScanLine[cut + iy * ySizeBig + y];
+        PixelPtr.Init(BigImp, 0, cut + iy * ySizeBig + y);
         for x := 0 to xSizeBig - 1 do
         begin
@@ -541 +540 @@
           for ch := 0 to 2 do
           begin
-            c := line[ix * xSizeBig + x, ch];
+            PixelPtr.SetX(ix * xSizeBig + x);
+            c := PixelPtr.Pixel^.Planes[ch];
             inc(resampled[ir, ch], c * xdivider * ydivider);
             if xdivider < xSizeSmall then
@@ -558 +558 @@
 
   // sharpen resampled icons
-  SmallImp.width := nx;
-  SmallImp.height := ny;
+  SmallImp.SetSize(nx, ny);
   SmallImp.BeginUpdate;
-  for y := 0 to ny - 1 do
-  begin
-    line := SmallImp.ScanLine[y];
+  for y := 0 to ny - 1 do begin
+    PixelPtr.Init(SmallImp, 0, y);
     for x := 0 to nx - 1 do
-      for ch := 0 to 2 do
-      begin
+      for ch := 0 to 2 do begin
         sum := 0;
         Cnt := 0;
@@ -581 +578 @@
         sum := ((Cnt * Sharpen + 800) * resampled[x + nx * y, ch] - sum *
           Sharpen) div (800 * xSizeBig * (ySizeBig - 2 * cut));
-        if sum < 0 then
-          sum := 0;
-        if sum > 255 then
-          sum := 255;
-        line[x][ch] := sum;
+        if sum < 0 then sum := 0;
+        if sum > 255 then sum := 255;
+        PixelPtr.SetX(x);
+        PixelPtr.Pixel^.Planes[ch] := sum;
       end;
   end;
@@ -4066 +4062 @@
 
 procedure TMainScreen.MiniPaint;
-type
-  TLine = array [0 .. 99999999, 0 .. 2] of Byte;
 var
   uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniLine, MiniLine: ^TLine;
+  PrevMiniPixel, MiniPixel: PPixel32;
 begin
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
@@ -4080 +4074 @@
     FillRect(Rect(0, 0, Mini.width, Mini.height));
   end;
-  MiniLine := nil;
   Mini.BeginUpdate;
   for y := 0 to G.ly - 1 do
   begin
-    PrevMiniLine := MiniLine;
-    MiniLine := Mini.ScanLine[y];
     for x := 0 to G.lx - 1 do
       if MyMap[x + G.lx * y] and fTerrain <> fUNKNOWN then
@@ -4093 +4084 @@
         begin
           xm := ((x - xwMini) * 2 + i + y and 1 - hw + G.lx * 5) mod (G.lx * 2);
+          MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
           cm := MiniColors[MyMap[Loc] and fTerrain, i];
           if ClientMode = cEditMap then
@@ -4115 +4107 @@
             end;
             cm := $808080 or cm shr 1; { increase brightness }
-            if PrevMiniLine <> nil then
-            begin // 2x2 city dot covers two scanlines
-              PrevMiniLine[xm, 0] := cm shr 16;
-              PrevMiniLine[xm, 1] := cm shr 8 and $FF;
-              PrevMiniLine[xm, 2] := cm and $FF;
+            if y > 0 then begin
+              // 2x2 city dot covers two scanlines
+              PrevMiniPixel := GetBitmapPixelPtr(Mini, xm, y - 1);
+              PrevMiniPixel^.B := cm shr 16;
+              PrevMiniPixel^.G := cm shr 8 and $FF;
+              PrevMiniPixel^.R := cm and $FF;
             end
           end
@@ -4148 +4141 @@
               cm := Tribe[MyRO.Territory[Loc]].Color;
           end;
-          MiniLine[xm, 0] := cm shr 16;
-          MiniLine[xm, 1] := cm shr 8 and $FF;
-          MiniLine[xm, 2] := cm and $FF;
+          MiniPixel^.B := cm shr 16;
+          MiniPixel^.G := cm shr 8 and $FF;
+          MiniPixel^.R := cm and $FF;
         end;
       end;