Changeset 11 for trunk/UGame.pas

Timestamp:

Oct 4, 2019, 11:57:05 PM (5 years ago)

Author:

chronos

Message:

• Added: Configurable speed of animations.

File:

• trunk/UGame.pas (modified) (8 diffs)

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Dialogs, fgl, Graphics, Types, Forms, Math;
+  Classes, SysUtils, Dialogs, fgl, Graphics, Types, Forms, Math, DateUtils;
 
 type
@@ -30 +30 @@
   TGame = class
   private
+    FMoving: Boolean;
     FOnChange: TNotifyEvent;
     FRunning: Boolean;
@@ -43 +44 @@
     Cells: array of array of TCell;
     TopScore: Integer;
+    AnimationDuration: Integer;
     procedure GameOver;
     function FillRandomCell: Integer;
@@ -60 +62 @@
     property Running: Boolean read FRunning write FRunning;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
+    property Moving: Boolean read FMoving;
   end;
 
@@ -318 +321 @@
   MovedCount: Integer;
   X, Y: Integer;
-  Step: Integer;
   I: Integer;
-const
-  StepCount = 10;
-  AnimationDuration = 30;
-begin
+  StartTime: TDateTime;
+  EndTime: TDateTime;
+  Time: TDateTime;
+  Part: Double;
+begin
+  FMoving := True;
   //Diff := DirectionDiff[Direction];
   case Direction of
@@ -397 +401 @@
       Inc(PI.Y);
     end;
-    for Step := 0 to StepCount - 2 do begin
+
+    // Animate cell move
+    StartTime := Now;
+    EndTime := StartTime + AnimationDuration / 300 * OneSecond / Size.X;
+    if AnimationDuration > 0 then
+    repeat
+      Time := Now;
+      Part := (Time - StartTime) / (EndTime - StartTime);
       for Y := 0 to Size.Y - 1 do
         for X := 0 to Size.X - 1 do begin
           if Cells[Y, X].Moving then
-            Cells[Y, X].Shift := Point(Trunc(Step / StepCount * MoveDirection.X * 100),
-              Trunc(Step / StepCount * MoveDirection.Y * 100));
+            Cells[Y, X].Shift := Point(Trunc(Part * MoveDirection.X * 100),
+              Trunc(Part * MoveDirection.Y * 100));
         end;
       DoChange;
       Application.ProcessMessages;
-      Sleep(AnimationDuration div StepCount);
-    end;
+      Sleep(10);
+    until Time > EndTime;
+
+    // Set final cell values
     for Y := 0 to Size.Y - 1 do
       for X := 0 to Size.X - 1 do begin
@@ -416 +429 @@
   end;
   Result := MovedCount;
+  FMoving := False;
 end;
 
@@ -434 +448 @@
 constructor TGame.Create;
 begin
+  AnimationDuration := 30;
 end;