Changeset 56

Timestamp:

Nov 5, 2019, 1:27:20 AM (4 years ago)

Author:

chronos

Message:

• Added: Animation of tiles merge.

File:

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

trunk/UGame.pas

@@ -633 +633 @@
     Frame.Top + Frame.Height div 2 + (Board.Size.Y * TileSize.Y) div 2);
 
-  TileMargin := Round(Frame.Width / Board.Size.X * 0.025);
+  TileMargin := Round(Frame.Width / Board.Size.X * 0.03);
 
   Canvas.Brush.Style := bsSolid;
@@ -673 +673 @@
     end;
 
-  // Draw moving tiles
+  // Draw appearing tiles
   for Y := 0 to Board.Size.Y - 1 do
     for X := 0 to Board.Size.X - 1 do
@@ -691 +691 @@
       TileRect := Rect(TileCenter.X - S.X div 2, TileCenter.Y - S.Y div 2,
         TileCenter.X + S.X div 2, TileCenter.Y + S.Y div 2);
+      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
+    end;
+
+  // Draw merging tiles
+  for Y := 0 to Board.Size.Y - 1 do
+    for X := 0 to Board.Size.X - 1 do
+    if Board.Tiles[Y, X].Action = taMerge then begin
+      Canvas.Brush.Color := GetTileColor(Board.Tiles[Y, X].Value);
+      Canvas.Brush.Style := bsSolid;
+      TileRect := Bounds(
+        Frame.Left + X * TileSize.X + TileMargin,
+        Frame.Top + Y * TileSize.Y + TileMargin,
+        TileSize.X - 2 * TileMargin,
+        TileSize.Y - 2 * TileMargin);
+      S := Point(
+        Trunc((50 - Abs(Board.Tiles[Y, X].Shift.X - 50)) / 50 * TileMargin),
+        Trunc((50 - Abs(Board.Tiles[Y, X].Shift.Y - 50)) / 50 * TileMargin)
+      );
+      TileRect := Rect(TileRect.Left - S.X, TileRect.Top - S.Y,
+        TileRect.Right + S.X, TileRect.Bottom + S.Y);
       RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
     end;
@@ -777 +797 @@
     FCanUndo := False;
     FRunning := CanMove;
-    History.Moves.Delete(History.Moves.Count - 1);
+    if RecordHistory then History.Moves.Delete(History.Moves.Count - 1);
     DoChange;
   end;
@@ -938 +958 @@
   for Y := 0 to Board.Size.Y - 1 do
     for X := 0 to Board.Size.X - 1 do begin
+      if Board.Tiles[Y, X].Merged then
+        Board.Tiles[Y, X].Action := taMerge;
       Board.Tiles[Y, X].Shift := Point(0, 0);
-      Board.Tiles[Y, X].Action := taNone;
+      if Board.Tiles[Y, X].Action = taMove then begin
+        Board.Tiles[Y, X].Action := taNone;
+      end;
       Board.Tiles[Y, X].Value := Board.Tiles[Y, X].NewValue;
     end;
@@ -959 +983 @@
 procedure TGame.AnimateTiles;
 var
-  I: Integer;
   StartTime: TDateTime;
   EndTime: TDateTime;
@@ -980 +1003 @@
         if Board.Tiles[Y, X].Action = taAppear then
           Board.Tiles[Y, X].Shift := Point(Trunc(Part * 100), Trunc(Part * 100));
+        if Board.Tiles[Y, X].Action = taMerge then
+          Board.Tiles[Y, X].Shift := Point(Trunc(Part * 100), Trunc(Part * 100));
       end;
     DoChange;
@@ -988 +1013 @@
   for Y := 0 to Board.Size.Y - 1 do
     for X := 0 to Board.Size.X - 1 do
-      if Board.Tiles[Y, X].Action = taAppear then begin
+      if Board.Tiles[Y, X].Action <> taNone then begin
         Board.Tiles[Y, X].Action := taNone;
         Board.Tiles[Y, X].Shift := Point(0, 0);