Changeset 49

Timestamp:

Aug 22, 2019, 9:50:21 AM (5 years ago)

Author:

chronos

Message:

• Modified: Use TPaintBox for drawing.

Location:

branches/paintbox

Files:

• Forms/UMainForm.lfm (modified) (2 diffs)
• Forms/UMainForm.pas (modified) (8 diffs)
• UEngine.pas (modified) (9 diffs)

branches/paintbox/Forms/UMainForm.lfm

@@ -47 +47 @@
     SimplePanel = False
   end
-  object Image1: TImage
+  object PaintBox1: TPaintBox
     Left = 0
     Height = 462
@@ -53 +53 @@
     Width = 642
     Align = alClient
-    OnMouseLeave = Image1MouseLeave
-    OnResize = Image1Resize
+    OnPaint = PaintBox1Paint
+    OnResize = PaintBox1Resize
   end
   object TimerDraw: TTimer

branches/paintbox/Forms/UMainForm.pas

@@ -23 +23 @@
     AFullScreen: TAction;
     ActionList1: TActionList;
-    Image1: TImage;
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
@@ -33 +32 @@
     MenuItem7: TMenuItem;
     MenuItem8: TMenuItem;
+    PaintBox1: TPaintBox;
     StatusBar1: TStatusBar;
     TimerDraw: TTimer;
@@ -50 +50 @@
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
-    procedure Image1MouseLeave(Sender: TObject);
-    procedure Image1Resize(Sender: TObject);
+    procedure PaintBox1Paint(Sender: TObject);
+    procedure PaintBox1Resize(Sender: TObject);
     procedure TimerDrawTimer(Sender: TObject);
     procedure TimerEngineTickTimer(Sender: TObject);
@@ -62 +62 @@
     procedure LoadConfig;
     procedure SaveConfig;
+    procedure EngineRepaint(Sender: TObject);
   public
     PersistentForm: TPersistentForm;
@@ -125 +126 @@
 end;
 
+procedure TMainForm.EngineRepaint(Sender: TObject);
+begin
+  PaintBox1.Repaint;
+end;
+
 procedure TMainForm.EraseBackground(DC: HDC);
 begin
@@ -142 +148 @@
   DoubleBuffered := False;
   Engine := TEngine.Create;
-  Engine.Bitmap := Image1.Picture.Bitmap;
+  Engine.OnRepaint := EngineRepaint;
   Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode('cs');
   LoadConfig;
   Engine.NewGame;
   Engine.Active := True;
-  Image1Resize(Self);
-  Image1.ControlStyle := Image1.ControlStyle + [csOpaque];
+  PaintBox1Resize(Self);
+  ControlStyle := ControlStyle + [csOpaque];
+  PaintBox1.ControlStyle := PaintBox1.ControlStyle + [csOpaque];
 end;
 
@@ -205 +212 @@
 procedure TMainForm.AShowRawImageDescExecute(Sender: TObject);
 begin
-  ShowMessage(Image1.Picture.Bitmap.RawImage.Description.AsString);
+  ShowMessage(Engine.Bitmap.RawImage.Description.AsString);
 end;
 
@@ -244 +251 @@
 end;
 
-procedure TMainForm.Image1MouseLeave(Sender: TObject);
-begin
-
-end;
-
-procedure TMainForm.Image1Resize(Sender: TObject);
+procedure TMainForm.PaintBox1Paint(Sender: TObject);
+begin
+  PaintBox1.Canvas.StretchDraw(Rect(0, 0, PaintBox1.Width, PaintBox1.Height), Engine.Bitmap);
+end;
+
+procedure TMainForm.PaintBox1Resize(Sender: TObject);
 begin
   try
     Engine.Lock.Acquire;
-    Image1.Picture.Bitmap.SetSize(Image1.Width, Image1.Height);
+    Engine.Bitmap.SetSize(PaintBox1.Width, PaintBox1.Height);
     Engine.ResizePlayerFrames;
   finally

branches/paintbox/UEngine.pas

@@ -219 +219 @@
     FBitmapLock: TCriticalSection;
     FOnGameEnd: TNotifyEvent;
+    FOnRepaint: TNotifyEvent;
     FRedrawPending: Boolean;
     FBitmapLower: TBitmapTColor;
@@ -230 +231 @@
     function IsInsideHouses(Pos: TPoint): Boolean;
     procedure DoDrawToBitmap;
+    procedure DoOnRepaint;
     procedure InitPlayerPool;
     procedure InitPlayers;
@@ -257 +259 @@
     property Active: Boolean read FActive write SetActive;
     property OnGameEnd: TNotifyEvent read FOnGameEnd write FOnGameEnd;
+    property OnRepaint: TNotifyEvent read FOnRepaint write FOnRepaint;
   end;
 
@@ -370 +373 @@
   repeat
     Engine.Draw(Self);
-    Sleep(50);
+    //Sleep(50);
   until Terminated;
 end;
@@ -1154 +1157 @@
 begin
   FBitmap := AValue;
-  ResizePlayerFrames;
 end;
 
@@ -1271 +1273 @@
 end;
 
+procedure TEngine.DoOnRepaint;
+begin
+  if Assigned(FOnRepaint) then FOnRepaint(Self);
+end;
+
 procedure TEngine.InitDigMasks;
 var
@@ -1520 +1527 @@
 constructor TEngine.Create;
 begin
+  FBitmap := TBitmap.Create;
   Lock := TCriticalSection.Create;
   FBitmapLower := TBitmapTColor.Create;
@@ -1557 +1565 @@
   FreeAndNil(AudioShot);
   FreeAndNil(AudioExplode);
+  FreeAndNil(FBitmap);
   inherited Destroy;
 end;
@@ -1593 +1602 @@
       Lock.Release;
     end;
-    if not Thread.Terminated then Thread.Synchronize(DoDrawToBitmap);
+    if not Thread.Terminated then DoDrawToBitmap;
+    if not Thread.Terminated then Thread.Synchronize(DoOnRepaint);
     DrawDuration := NowPrecise - DrawStart;
   end;