Changeset 18 for trunk

Timestamp:

Jan 21, 2018, 10:21:23 PM (7 years ago)

Author:

chronos

Message:

• Modified: Optimized drawing virtual screen to form canvas.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (2 diffs)
• Platform/Base/UPlatformBase.pas (modified) (2 diffs)

trunk/Forms/UFormMain.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ExtCtrls, Menus, ActnList, UKernel, UMemory, UDevice, UPlatformBase, LCLType,
-  UGraphics;
+  UGraphics, GraphType;
 
 type
@@ -188 +188 @@
 var
   X, Y: Integer;
-  DX, DY: Integer;
-  P, PR: PByte;
-begin
+  SourceBytePerPixel: Integer;
+  SourceBytePerLine: Integer;
+  SourcePixelPtr: PByte;
+  SourcePixelRowPtr: PByte;
+  RawImage: TRawImage;
+  DestPixelRowPtr: PByte;
+  DestPixelPtr: PByte;
+  DestBytePerPixel: Integer;
+  DestBytePerLine: Integer;
+  SizeX: Integer;
+  SizeY: Integer;
+begin
+{  var
+    X, Y: Integer;
+    PixelPtr: PInteger;
+    PixelRowPtr: PInteger;
+    RawImage: TRawImage;
+    BytePerPixel: Integer;
+    SourcePixelPtr: Integer;
+  begin
+    try
+      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
+          SourcePixelPtr := TMatter(Matter[Surface.ItemsXY[Trunc(X / Bitmap.Width * Surface.Count.X),
+              Trunc(Y / Bitmap.Height * Surface.Count.Y)]]).Color;
+          PixelPtr^ := SwapBRComponent(SourcePixelPtr);
+          Inc(PByte(PixelPtr), BytePerPixel);
+        end;
+        Inc(PByte(PixelRowPtr), RawImage.Description.BytesPerLine);
+      end;
+    finally
+      Bitmap.EndUpdate;
+    end;
+}
   try
+    TempBitmap.SetSize(VideoDevice.VideoMode.Size.X, VideoDevice.VideoMode.Size.Y);
     TempBitmap.BeginUpdate;
-    TempBitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
-
+    RawImage := TempBitmap.RawImage;
+    DestPixelRowPtr := RawImage.Data;
+    DestBytePerPixel := RawImage.Description.BitsPerPixel div 8;
+    DestBytePerLine := RawImage.Description.BytesPerLine;
     if Assigned(VideoDevice.VideoMemory) then begin
-      DX := VideoDevice.VideoMode.GetBytesPerPixel;
-      DY := VideoDevice.VideoMode.GetBytesPerLine;
-      P := VideoDevice.VideoMemory;
-      for Y := 0 to VideoDevice.VideoMode.Size.Y - 1 do begin
-        PR := P;
-        for X := 0 to VideoDevice.VideoMode.Size.X - 1 do begin
-          TempBitmap.Canvas.Pixels[X, Y] := PInteger(PR)^ and $ffffff;
-          Inc(PR, DX);
+      SourceBytePerPixel := VideoDevice.VideoMode.GetBytesPerPixel;
+      SourceBytePerLine := VideoDevice.VideoMode.GetBytesPerLine;
+      SourcePixelRowPtr := VideoDevice.VideoMemory;
+      SizeX := VideoDevice.VideoMode.Size.X;
+      SizeY := VideoDevice.VideoMode.Size.Y;
+      for Y := 0 to SizeY - 1 do begin
+        SourcePixelPtr := SourcePixelRowPtr;
+        DestPixelPtr := DestPixelRowPtr;
+        for X := 0 to SizeX - 1 do begin
+          PInteger(DestPixelPtr)^ := PInteger(SourcePixelPtr)^ and $ffffff;
+          Inc(SourcePixelPtr, SourceBytePerPixel);
+          Inc(DestPixelPtr, DestBytePerPixel);
         end;
-        Inc(P, DY);
+        Inc(SourcePixelRowPtr, SourceBytePerLine);
+        Inc(DestPixelRowPtr, DestBytePerLine);
       end;
     end;
   finally
+    TempBitmap.EndUpdate;
     PaintBox1.Canvas.Draw(0, 0, TempBitmap);
-    TempBitmap.EndUpdate;
   end;
 end;

trunk/Platform/Base/UPlatformBase.pas

@@ -66 +66 @@
   protected
     procedure SetVideoMode(Mode: TVideoMode); override;
+    function GetVideoMemory: PByte; override;
   public
     VideoMemory: PByte;
@@ -71 +72 @@
     Canvas: TCanvas;
     procedure GetSupportedModes(Modes: TObjectList); override;
-    function GetVideoMemory: PByte; override;
     procedure VideoMemoryChange; override;
     constructor Create; override;