Changeset 65 for trunk/Forms

Timestamp:

Jan 23, 2020, 12:21:53 AM (5 years ago)

Author:

chronos

Message:

• Added: Separated TGame paint and state change events.
• Modified: Animate tiles movements in background thread.
• Modified: Initialize TCore as first application form.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (10 diffs)

trunk/Forms/UFormMain.lfm

@@ -55 +55 @@
   end
   object TimerDraw: TTimer
-    Interval = 20
+    Interval = 10
     OnTimer = TimerDrawTimer
     left = 138

trunk/Forms/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus, Math,
-  ActnList, ExtCtrls, StdCtrls, UGame, UPersistentForm, UApplicationInfo;
+  ActnList, ExtCtrls, StdCtrls, UGame, UPersistentForm, UApplicationInfo,
+  LCLType, Syncobjs, DateUtils;
 
 type
+  TFormMain = class;
+
+  { TMoveThread }
+
+  TMoveThread = class(TThread)
+    FormMain: TFormMain;
+    procedure Execute; override;
+  end;
 
   { TFormMain }
@@ -39 +48 @@
     procedure FormShow(Sender: TObject);
     procedure TimerDrawTimer(Sender: TObject);
+    procedure EraseBackground(DC: HDC); override;
   private
+    DrawDuration: TDateTime;
     MouseStart: TPoint;
     MouseDown: Boolean;
     RedrawPending: Boolean;
     MoveBuffer: array of TMoveDirection;
+    MoveBufferLock: TCriticalSection;
+    MoveThread: TMoveThread;
     procedure AddToMoveBuffer(Direction: TMoveDirection);
     procedure ProcessMoveBuffer;
@@ -60 +73 @@
 uses
   UCore;
+
+{ TMoveThread }
+
+procedure TMoveThread.Execute;
+begin
+  while not Terminated do begin
+    FormMain.ProcessMoveBuffer;
+    Sleep(10);
+  end;
+end;
 
 { TFormMain }
@@ -72 +95 @@
       40: AddToMoveBuffer(drDown);
     end;
-    ProcessMoveBuffer;
+    //ProcessMoveBuffer;
   end;
 end;
@@ -111 +134 @@
       else if (Angle > 135) and (Angle <= 225) then AddToMoveBuffer(drLeft)
       else if (Angle > 225) and (Angle <= 315) then AddToMoveBuffer(drUp);
-      ProcessMoveBuffer;
+      //ProcessMoveBuffer;
     end;
   end;
@@ -123 +146 @@
 
 procedure TFormMain.FormPaint(Sender: TObject);
-begin
+var
+  TimeStart: TDateTime;
+begin
+  TimeStart := Now;
   Core.Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
+  DrawDuration := Now - TimeStart;
 end;
 
@@ -130 +157 @@
 begin
   Core.PersistentForm1.Save(Self);
+  ControlStyle := [csOpaque];
 end;
 
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
+  MoveBufferLock := TCriticalSection.Create;
+  MoveThread := TMoveThread.Create(True);
+  MoveThread.FormMain := Self;
+  MoveThread.FreeOnTerminate := False;
+  MoveThread.Start;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
+  FreeAndNil(MoveThread);
+  FreeAndNil(MoveBuffer);
 end;
 
@@ -156 +191 @@
     RedrawPending := False;
     Repaint;
-  end;
+    Caption := FloatToStr(Round(DrawDuration / OneMillisecond));
+  end;
+end;
+
+procedure TFormMain.EraseBackground(DC: HDC);
+begin
+  // Do nothing
 end;
 
 procedure TFormMain.AddToMoveBuffer(Direction: TMoveDirection);
 begin
-  SetLength(MoveBuffer, Length(MoveBuffer) + 1);
-  MoveBuffer[Length(MoveBuffer) - 1] := Direction;
+  MoveBufferLock.Acquire;
+  try
+    SetLength(MoveBuffer, Length(MoveBuffer) + 1);
+    MoveBuffer[Length(MoveBuffer) - 1] := Direction;
+  finally
+    MoveBufferLock.Release;
+  end;
 end;
 
@@ -168 +214 @@
 begin
   if not Core.Game.Moving then begin
+    MoveBufferLock.Acquire;
     while Length(MoveBuffer) > 0 do begin
+      MoveBufferLock.Release;
       Core.Game.MoveAllAndUpdate(MoveBuffer[0], True);
+      MoveBufferLock.Acquire;
       if Length(MoveBuffer) > 1 then
         Move(MoveBuffer[1], MoveBuffer[0], (Length(MoveBuffer) - 1) * SizeOf(TMoveDirection));
@@ -175 +224 @@
         SetLength(MoveBuffer, Length(MoveBuffer) - 1);
     end;
-  end else begin
+    MoveBufferLock.Release;
   end;
 end;