Changeset 278 for branches

Timestamp:

Sep 6, 2020, 11:44:12 AM (4 years ago)

Author:

chronos

Message:

• Modified: Replace two magenta colors transparency with alpha channel transparency in some PNG images. Internally game still uses transparency with bitmap mask.

Location:

branches/AlphaChannel

Files:

• Graphics/Cities144x72.png (modified) ( previous)
• Graphics/Cities66x32.png (modified) ( previous)
• Graphics/Cities96x48.png (modified) ( previous)
• Graphics/Nation1.png (modified) ( previous)
• Graphics/Nation2.png (modified) ( previous)
• Graphics/StdCities.png (modified) ( previous)
• Graphics/StdUnits.png (modified) ( previous)
• Graphics/System.png (modified) ( previous)
• Graphics/System2.png (modified) ( previous)
• Graphics/Terrain144x72.png (modified) ( previous)
• Graphics/Terrain66x32.png (modified) ( previous)
• Graphics/Terrain96x48.png (modified) ( previous)
• Packages/CevoComponents/ScreenTools.pas (modified) (9 diffs)

branches/AlphaChannel/Packages/CevoComponents/ScreenTools.pas

@@ -397 +397 @@
 end;
 
+procedure FillRectBitmap(Bitmap: TBitmap; Color: TColor32);
+var
+  Ptr: TPixelPointer;
+  X, Y: Integer;
+begin
+  Bitmap.BeginUpdate;
+  Ptr := PixelPointer(Bitmap);
+  for Y := 0 to Bitmap.Height - 1 do begin
+    for X := 0 to Bitmap.Width - 1 do begin
+      Ptr.Pixel^.ARGB := Color;
+      Ptr.NextPixel;
+    end;
+    Ptr.NextLine;
+  end;
+  Bitmap.EndUpdate;
+end;
+
 function LoadGraphicFile(bmp: TBitmap; Path: string; Options: Integer): Boolean;
 var
@@ -424 +441 @@
   if ExtractFileExt(Path) = '.png' then begin
     Png := TPortableNetworkGraphic.Create;
-    Png.PixelFormat := Bmp.PixelFormat;
     try
       Png.LoadFromFile(Path);
@@ -432 +448 @@
     if Result then
     begin
-      if Options and gfNoGamma = 0 then
-        bmp.PixelFormat := pf24bit;
-      bmp.SetSize(Png.Width, Png.Height);
+      Bmp.Assign(Png);
+      //Bmp.SetSize(Png.Width, Png.Height);
+      //Bmp.PixelFormat := Png.PixelFormat;
+      //Bmp.Canvas.FillRect(0, 0, Bmp.Width, Bmp.Height);
+      //FillRectBitmap(Bmp, $00000000);
       if (Png.RawImage.Description.Format = ricfGray) then
       begin
@@ -440 +458 @@
         Bmp.PixelFormat := pf24bit;
         CopyGray8BitTo24bitBitmap(Bmp, Png);
-      end
-      else
-        Bmp.Canvas.draw(0, 0, Png);
+      end;
+      //else
+        //Bmp.Canvas.Draw(0, 0, Png);
+      //Bmp.SaveToFile(Path + '.bmp');
     end;
     Png.Free;
@@ -475 +494 @@
   FileName: string;
   Source: TBitmap;
-  DataPixel, MaskPixel: TPixelPointer;
+  SourcePixel: TPixelPointer;
+  DataPixel: TPixelPointer;
+  MaskPixel: TPixelPointer;
 begin
   I := 0;
@@ -483 +504 @@
   if I = nGrExt then begin
     Source := TBitmap.Create;
-    Source.PixelFormat := pf24bit;
     FileName := GetGraphicsDir + DirectorySeparator + Name;
     if not LoadGraphicFile(Source, FileName) then begin
@@ -493 +513 @@
     GrExt[nGrExt].Name := Name;
 
-    xmax := Source.Width - 1; // allows 4-byte access even for last pixel
+    //xmax := Source.Width - 1; // allows 4-byte access even for last pixel
     // Why there was that limit?
     //if xmax > 970 then
     //  xmax := 970;
 
-    GrExt[nGrExt].Data := Source;
+    GrExt[nGrExt].Data := TBitmap.Create;
     GrExt[nGrExt].Data.PixelFormat := pf24bit;
+    GrExt[nGrExt].Data.SetSize(Source.Width, Source.Height);
     GrExt[nGrExt].Mask := TBitmap.Create;
     GrExt[nGrExt].Mask.PixelFormat := pf24bit;
     GrExt[nGrExt].Mask.SetSize(Source.Width, Source.Height);
 
+    // Extract data and mask from transparent image
+    Source.BeginUpdate;
     GrExt[nGrExt].Data.BeginUpdate;
     GrExt[nGrExt].Mask.BeginUpdate;
+    SourcePixel := PixelPointer(Source);
     DataPixel := PixelPointer(GrExt[nGrExt].Data);
     MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
     for y := 0 to ScaleToNative(Source.Height) - 1 do begin
-      for x := 0 to ScaleToNative(xmax) - 1 do begin
-        OriginalColor := DataPixel.Pixel^.ARGB and $FFFFFF;
-        if (OriginalColor = $FF00FF) or (OriginalColor = $7F007F) then
-        begin // transparent
+      for x := 0 to ScaleToNative(Source.Width) - 1 do begin
+        if SourcePixel.Pixel^.ARGB = $00000000 then begin // transparent
           MaskPixel.Pixel^.ARGB := $FFFFFF;
-          DataPixel.Pixel^.ARGB := DataPixel.Pixel^.ARGB and $FF000000;
+          DataPixel.Pixel^.ARGB := 0;
         end
         else begin
           MaskPixel.Pixel^.ARGB := $000000; // non-transparent
+          DataPixel.Pixel^.ARGB := SourcePixel.Pixel^.ARGB and $FFFFFF;
           if Gamma <> 100 then
             DataPixel.Pixel^ := ApplyGammaToPixel(DataPixel.Pixel^);
         end;
+        SourcePixel.NextPixel;
         DataPixel.NextPixel;
         MaskPixel.NextPixel;
       end;
+      SourcePixel.NextLine;
       DataPixel.NextLine;
       MaskPixel.NextLine;
     end;
+    Source.EndUpdate;
     GrExt[nGrExt].Data.EndUpdate;
     GrExt[nGrExt].Mask.EndUpdate;
@@ -532 +558 @@
     FillChar(GrExt[nGrExt].pixUsed, GrExt[nGrExt].Data.Height div 49 * 10, 0);
     Inc(nGrExt);
+
+    Source.Free;
   end;
 end;
@@ -1544 +1572 @@
   for Y := 0 to ScaleToNative(Dest.Height) - 1 do begin
     for X := 0 to ScaleToNative(Dest.Width) - 1 do begin
-      if (DstPixel.Pixel^.ARGB and $FFFFFF) = TransparentColor then begin
+      if (DstPixel.Pixel^.ARGB and $ffffff) = TransparentColor then begin
         SrcPixel.SetXY(X mod TexWidth, Y mod TexHeight);
         DstPixel.Pixel^.B := SrcPixel.Pixel^.B;