Changeset 331 for trunk

Timestamp:

Mar 26, 2021, 3:24:15 PM (4 years ago)

Author:

chronos

Message:

• Modified: Player border tile preparation code for bitmap color replacement moved to ScreenTools.

Location:

trunk

Files:

• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/IsoEngine.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (2 diffs)
• Packages/CevoComponents/UPixelPointer.pas (modified) (3 diffs)

trunk/LocalPlayer/Help.pas

@@ -771 +771 @@
                   xxt * 2 - 8, yyt * 2 - 4, 5 + 2 * (xxt * 2 + 1),
                   3 + yyt + 2 * (yyt * 3 + 1));
-                srcno := 45
+                srcno := 45;
               end
               else

trunk/LocalPlayer/IsoEngine.pas

@@ -1093 +1093 @@
   var
     dx, dy: integer;
-    PixelPtr: TPixelPointer;
   begin
     if ShowBorder and (Loc >= 0) and (Loc < G.lx * G.ly) and
@@ -1104 +1103 @@
             yyt * 2, HGrTerrain.Data.Canvas,
             1 + 8 * (xxt * 2 + 1), 1 + yyt + 16 * (yyt * 3 + 1));
-          Borders.BeginUpdate;
-          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;
-                PixelPtr.Pixel^.G := Tribe[p1].Color shr 8 and $FF;
-                PixelPtr.Pixel^.R := Tribe[p1].Color and $FF;
-              end;
-              PixelPtr.NextPixel;
-            end;
-            PixelPtr.NextLine;
-          end;
-          Borders.EndUpdate;
+          BitmapReplaceColor(Borders, 0, p1 * (yyt * 2), xxt * 2, yyt * 2, $636363, Tribe[p1].Color);
           BordersOK^ := BordersOK^ or 1 shl p1;
         end;

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -42 +42 @@
 function LoadGraphicSet2(const Name: string): TGraphicSet;
 procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
+procedure BitmapReplaceColor(Dst: TBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
 procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: integer);
   overload;
@@ -567 +568 @@
 end;
 
+procedure BitmapReplaceColor(Dst: TBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
+var
+  XX, YY: Integer;
+  PixelPtr: TPixelPointer;
+begin
+  Dst.BeginUpdate;
+  PixelPtr := PixelPointer(Dst, ScaleToNative(X), ScaleToNative(Y));
+  for YY := 0 to ScaleToNative(Height) - 1 do begin
+    for XX := 0 to ScaleToNative(Width) - 1 do begin
+      if PixelPtr.Pixel^.RGB = SwapRedBlue(OldColor) then begin
+        PixelPtr.Pixel^.RGB := SwapRedBlue(NewColor);
+      end;
+      PixelPtr.NextPixel;
+    end;
+    PixelPtr.NextLine;
+  end;
+  Dst.EndUpdate;
+end;
+
 procedure MakeBlue(Dst: TBitmap; X, Y, Width, Height: Integer);
 var

trunk/Packages/CevoComponents/UPixelPointer.pas

@@ -9 +9 @@
   TColor32 = type Cardinal;
   TColor32Component = (ccBlue, ccGreen, ccRed, ccAlpha);
+
+  { TPixel32 }
+
   TPixel32 = packed record
+  private
+    function GetRGB: Cardinal;
+    procedure SetRGB(AValue: Cardinal);
+  public
+    property RGB: Cardinal read GetRGB write SetRGB;
     case Integer of
       0: (B, G, R, A: Byte);
@@ -37 +45 @@
 
   function PixelPointer(Bitmap: TRasterImage; BaseX: Integer = 0; BaseY: Integer = 0): TPixelPointer; inline;
-
+  function SwapRedBlue(Color: TColor32): TColor32;
 
 implementation
+
+{ TPixel32 }
+
+function TPixel32.GetRGB: Cardinal;
+begin
+  Result := ARGB and $ffffff;
+end;
+
+procedure TPixel32.SetRGB(AValue: Cardinal);
+begin
+  R := (AValue shr 16) and $ff;
+  G := (AValue shr 8) and $ff;
+  B := (AValue shr 0) and $ff;
+end;
 
 { TPixelPointer }
@@ -86 +108 @@
 end;
 
+function SwapRedBlue(Color: TColor32): TColor32;
+begin
+  Result := (Color and $ff00ff00) or ((Color and $ff) shl 16) or ((Color shr 16) and $ff);
+end;
+
 
 end.