Changeset 8 for trunk/UCore.pas

Timestamp:

Mar 16, 2011, 10:47:36 PM (14 years ago)

Author:

george

Message:

• Modified: Speed up drawing of screen image and map overview using TBitmap.RawImage.

File:

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

trunk/UCore.pas

@@ -7 +7 @@
 uses
   Dialogs, Classes, SysUtils, Contnrs, Graphics, SpecializedMatrix, SpecializedList,
-  IntfGraphics, FPImage, LCLType, SpecializedBitmap;
+  IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType;
 
 const
@@ -96 +96 @@
     FRedrawPending: Boolean;
     FBitmapLower: TBitmapTColor;
+    IntfImage: TLazIntfImage;
     function GetPlayerCount: Integer;
     procedure SetBitmap(const AValue: TBitmap);
@@ -229 +230 @@
 var
   X, Y: Integer;
+  PixelPtr: PInteger;
+  PixelRowPtr: PInteger;
+  RawImage: TRawImage;
+  BytePerPixel: Integer;
+  P: Integer;
 begin
   try
-    Bitmap.BeginUpdate(True);
-  for Y := 0 to Bitmap.Height - 1 do
-    for X := 0 to Bitmap.Width - 1 do
-      Bitmap.Canvas.Pixels[X, Y] := SurfaceMatterColors[TSurfaceMatter(
-        Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
-          Trunc(Y / Bitmap.Height * Surface.Count.Y)])];
+    Bitmap.BeginUpdate;
+    RawImage := Bitmap.RawImage;
+    PixelRowPtr := PInteger(RawImage.Data);
+    BytePerPixel := RawImage.Description.BitsPerPixel div 8;
+    for Y := 0 to Bitmap.Height - 1 do begin
+      PixelPtr := PixelRowPtr;
+      for X := 0 to Bitmap.Width - 1 do begin
+        P := SurfaceMatterColors[TSurfaceMatter(
+          Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
+            Trunc(Y / Bitmap.Height * Surface.Count.Y)])];
+        PixelPtr^ := ((P and $ff) shl 16) or (P and $00ff00) or ((P shr 16) and $ff);
+        Inc(PByte(PixelPtr), BytePerPixel);
+      end;
+      Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
+    end;
   finally
     Bitmap.EndUpdate;
@@ -591 +606 @@
 begin
   FBitmapLower := TBitmapTColor.Create;
+  IntfImage := TLazIntfImage.Create(1, 1);
   Players := TObjectList.Create;
   World := TWorld.Create;
@@ -600 +616 @@
 begin
   FBitmapLower.Free;
+  IntfImage.Free;
   Players.Free;
   World.Free;
@@ -616 +633 @@
 procedure TEngine.Draw;
 var
-  IntfImage: TLazIntfImage;
   I: Integer;
   X, Y: Integer;
   H, W: Integer;
   Ratio: Single;
+  PixelPtr: PInteger;
+  PixelRowPtr: PInteger;
+  RawImage: TRawImage;
+  BytePerPixel: Integer;
+  P: Integer;
 begin
   if FRedrawPending then begin
@@ -627 +648 @@
       TPlayer(Players[I]).Paint;
     end;
-    if Assigned(FBitmap) then begin
-      //FBitmap.Canvas.StretchDraw(Rect(0, 0, FBitmap.Width, FBitmap.Height), FBitmapLower);
-      try
-        IntfImage := FBitmap.CreateIntfImage;
-        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
-          for X := 0 to Trunc(FBitmapLower.Width * Ratio) - 1 do
-            IntfImage.Colors[X, Y] := TColorToFPColor(FBitmapLower.Pixels[Trunc(X / Ratio), Trunc(Y / Ratio)]);
-        FBitmap.LoadFromIntfImage(IntfImage);
-      finally
-        IntfImage.Free;
+    if Assigned(FBitmap) then try
+      Bitmap.BeginUpdate(False);
+      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);
+      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);
+        end;
+        Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
       end;
+    finally
+      FBitmap.EndUpdate(False);
     end;
     FRedrawPending := False;