Changeset 279

Timestamp:

Sep 6, 2020, 12:29:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Big textures upscaled from middle ones instead of smaller ones.

Location:

branches/AlphaChannel

Files:

• Graphics/Cities144x72.png (modified) ( previous)
• Graphics/Terrain144x72.png (modified) ( previous)
• Packages/CevoComponents/ScreenTools.pas (modified) (4 diffs)

branches/AlphaChannel/Packages/CevoComponents/ScreenTools.pas

@@ -448 +448 @@
     if Result then
     begin
-      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);
+      Bmp.Assign(Png); // Force Bmp image description from Png to have alpha channel
+
       if (Png.RawImage.Description.Format = ricfGray) then
       begin
@@ -459 +456 @@
         CopyGray8BitTo24bitBitmap(Bmp, Png);
       end;
-      //else
-        //Bmp.Canvas.Draw(0, 0, Png);
-      //Bmp.SaveToFile(Path + '.bmp');
     end;
     Png.Free;
@@ -513 +507 @@
     GrExt[nGrExt].Name := Name;
 
-    //xmax := Source.Width - 1; // allows 4-byte access even for last pixel
+    // TODO: allows 4-byte pixel access even for last pixel to avoid memory overflow
+    xmax := Source.Width - 1;
     // Why there was that limit?
     //if xmax > 970 then
@@ -533 +528 @@
     MaskPixel := PixelPointer(GrExt[nGrExt].Mask);
     for y := 0 to ScaleToNative(Source.Height) - 1 do begin
-      for x := 0 to ScaleToNative(Source.Width) - 1 do begin
+      for x := 0 to ScaleToNative(xmax) - 1 do begin
         if SourcePixel.Pixel^.ARGB = $00000000 then begin // transparent
           MaskPixel.Pixel^.ARGB := $FFFFFF;