Changeset 10 for trunk/UCore.pas

Timestamp:

Mar 19, 2011, 4:30:27 PM (14 years ago)

Author:

george

Message:

• Modified: Optimized resampling of bitmap to higher resolution.

File:

• trunk/UCore.pas (modified) (4 diffs)

trunk/UCore.pas

@@ -7 +7 @@
 uses
   Dialogs, Classes, SysUtils, Contnrs, Graphics, SpecializedMatrix, SpecializedList,
-  IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType;
+  IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math;
 
 const
@@ -115 +115 @@
   end;
 
+  TFastBitmapPixelComponents = packed record
+    B, G, R, A: Byte;
+  end;
+
 const
   SurfaceMatterColors: array[TSurfaceMatter] of TColor = (clBlack, $0756b0,
@@ -127 +131 @@
   Engine: TEngine;
 
+function SwapBRComponent(Value: Integer): Integer; inline;
+
 implementation
+
+function SwapBRComponent(Value: Integer): Integer;
+begin
+//  Result := (Value and $00ff00) or ((Value shr 16) and $ff) or ((Value and $ff) shl 16);
+  Result := Value;
+  TFastBitmapPixelComponents(Result).R := TFastBitmapPixelComponents(Value).B;
+  TFastBitmapPixelComponents(Result).B := TFastBitmapPixelComponents(Value).R;
+end;
 
 { TTank }
@@ -635 +649 @@
   I: Integer;
   X, Y: Integer;
-  H, W: Integer;
-  Ratio: Single;
+  PixelX, PixelY: Integer;
+  SubPixelPtr: PInteger;
+  SubPixelRowPtr: PInteger;
+  SubPixelSizeX: Integer;
+  SubPixelSizeY: Integer;
   PixelPtr: PInteger;
   PixelRowPtr: PInteger;
+  BytePerPixel: Integer;
+  BytePerRow: Integer;
   RawImage: TRawImage;
-  BytePerPixel: Integer;
-  P: Integer;
-begin
-  if FRedrawPending then begin
-    FBitmapLower.FillAll(0);
+  Color: Integer;
+  Shift: TPoint;
+  XDiv, XMod, XAcc: Integer;
+  YDiv, YMod, YAcc: Integer;
+  Ratio: Real;
+  TargetHeight: Integer;
+  TargetWidth: Integer;
+begin
+  if FRedrawPending then
+  begin
+    FRedrawPending := False;
+    //FBitmapLower.FillAll(0);
     for I := 0 to Players.Count - 1 do begin
       TPlayer(Players[I]).Paint;
     end;
-    if Assigned(FBitmap) then try
-      Bitmap.BeginUpdate(False);
+    if Assigned(FBitmap) then
+    try
+      Bitmap.BeginUpdate;
       RawImage := Bitmap.RawImage;
-      PixelRowPtr := PInteger(RawImage.Data);
       BytePerPixel := RawImage.Description.BitsPerPixel div 8;
-      if (IntfImage.Width <> FBitmap.Width) or (IntfImage.Height <> FBitmap.Height) then
-        IntfImage.SetSize(FBitmap.Width, FBitmap.Height);
+      BytePerRow := RawImage.Description.BytesPerLine;
+      FillChar(RawImage.Data^, Bitmap.Height * BytePerRow, 0);
+
       if (FBitmap.Width / FBitmapLower.Width) < (FBitmap.Height / FBitmapLower.Height) then
         Ratio := FBitmap.Width / FBitmapLower.Width
         else Ratio := FBitmap.Height / FBitmapLower.Height;
-      for Y := 0 to Trunc(FBitmapLower.Height * Ratio) - 1 do begin
-        PixelPtr := PixelRowPtr;
-        for X := 0 to Trunc(FBitmapLower.Width * Ratio) - 1 do begin
-          P := FBitmapLower.Pixels[Trunc(X / Ratio), Trunc(Y / Ratio)];
-          PixelPtr^ := ((P and $ff) shl 16) or (P and $00ff00) or ((P shr 16) and $ff);
-          Inc(PByte(PixelPtr), BytePerPixel);
+
+      // Preserve aspect ratio
+      TargetWidth := Trunc(FBitmapLower.Width * Ratio);
+      TargetHeight := Trunc(FBitmapLower.Height * Ratio);
+
+      Shift.X := Trunc((Bitmap.Width - TargetWidth) / 2);
+      Shift.Y := Trunc((Bitmap.Height - TargetHeight) / 2);
+
+      XDiv := TargetWidth div FBitmapLower.Width;
+      XMod := TargetWidth mod FBitmapLower.Width;
+      YDiv := TargetHeight div FBitmapLower.Height;
+      YMod := TargetHeight mod FBitmapLower.Height;
+
+      PixelRowPtr := PInteger(RawImage.Data + BytePerRow * Shift.Y);
+      YAcc := FBitmapLower.Height div 2;
+      for Y := 0 to FBitmapLower.Height - 1 do begin
+        SubPixelSizeY := YDiv;
+        Inc(YAcc, YMod);
+        if YAcc >= FBitmapLower.Height then begin
+          Dec(YAcc, FBitmapLower.Height);
+          Inc(SubPixelSizeY);
         end;
-        Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
+
+        PixelPtr := PixelRowPtr + Shift.X;
+        XAcc := FBitmapLower.Width div 2;
+        for X := 0 to FBitmapLower.Width - 1 do begin
+          SubPixelSizeX := XDiv;
+          Inc(XAcc, XMod);
+          if XAcc >= FBitmapLower.Width then begin
+            Dec(XAcc, FBitmapLower.Width);
+            Inc(SubPixelSizeX);
+          end;
+
+          Color := SwapBRComponent(FBitmapLower.Pixels[X, Y]);
+
+          // Draw large pixel
+          SubPixelRowPtr := PixelPtr;
+          for PixelY := 0 to SubPixelSizeY - 1 do begin
+            SubPixelPtr := SubPixelRowPtr;
+            for PixelX := 0 to SubPixelSizeX - 1 do begin
+              SubPixelPtr^ := Color;
+              Inc(PByte(SubPixelPtr), BytePerPixel);
+            end;
+            Inc(PByte(SubPixelRowPtr), BytePerRow);
+          end;
+          Inc(PByte(PixelPtr), BytePerPixel * SubPixelSizeX);
+        end;
+        Inc(PByte(PixelRowPtr), BytePerRow * SubPixelSizeY);
       end;
     finally
-      FBitmap.EndUpdate(False);
-    end;
-    FRedrawPending := False;
+      FBitmap.EndUpdate;
+    end;
   end;
 end;