Changeset 9 for trunk

Timestamp:

Sep 26, 2019, 11:29:03 PM (5 years ago)

Author:

chronos

Message:

• Added: Cell move animation.

File:

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

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Dialogs, fgl, Graphics, Types;
+  Classes, SysUtils, Dialogs, fgl, Graphics, Types, Forms, Math;
 
 type
@@ -14 +14 @@
   TCell = class
     Value: Integer;
+    NewValue: Integer;
     Merged: Boolean;
+    Moving: Boolean;
+    Shift: TPoint;
     procedure Assign(Source: TCell);
   end;
@@ -204 +207 @@
   ValueStr: string;
   Frame: TRect;
+  CellRect: TRect;
   TextSize: TSize;
   TopBarHeight: Integer;
+  CellMargin: Integer;
 begin
   TopBarHeight := ScaleY(24, 96);
+  CellMargin := ScaleX(4, 96);
   Canvas.Brush.Style := bsSolid;
   Canvas.Brush.Color := clBlack;
@@ -228 +234 @@
     Frame.Top + Frame.Height div 2 + (Size.Y * CellSize.Y) div 2);
 
+  {  for Y := 0 to Size.Y - 1 do begin
+    Canvas.MoveTo(Frame.Left, Frame.Top + Y * CellSize.Y);
+    Canvas.LineTo(Frame.Left + Size.X * CellSize.X, Frame.Top + Y * CellSize.Y);
+  end;
+  for X := 0 to Size.X - 1 do begin
+    Canvas.MoveTo(Frame.Left + X * CellSize.X, Frame.Top);
+    Canvas.LineTo(Frame.Left + X * CellSize.X, Frame.Top + Size.Y * CellSize.Y);
+  end;
+  }
+  Canvas.Brush.Style := bsSolid;
+  Canvas.Brush.Color := clGray;
+  Canvas.FillRect(Frame);
+
   Canvas.Font.Color := clBlack;
+  // Draw static cells
   for Y := 0 to Size.Y - 1 do
     for X := 0 to Size.X - 1 do begin
-      Canvas.Brush.Color := GetCellColor(Cells[Y, X].Value);
+      if Cells[Y, X].Moving then Canvas.Brush.Color := GetCellColor(0)
+        else Canvas.Brush.Color := GetCellColor(Cells[Y, X].Value);
       Canvas.Brush.Style := bsSolid;
-      Canvas.FillRect(Rect(Frame.Left + X * CellSize.X, Frame.Top + Y * CellSize.Y,
-        Frame.Left + (X + 1) * CellSize.X, Frame.Top + (Y + 1) * CellSize.Y));
-      if Cells[Y, X].Value <> 0 then begin
+      CellRect := Bounds(
+        Frame.Left + X * CellSize.X + CellMargin,
+        Frame.Top + Y * CellSize.Y + CellMargin,
+        CellSize.X - 2 * CellMargin, CellSize.Y - 2 * CellMargin);
+      Canvas.FillRect(CellRect);
+      if (Cells[Y, X].Value <> 0) and not Cells[Y, X].Moving then begin
         ValueStr := IntToStr(Cells[Y, X].Value);
         Canvas.Brush.Style := bsClear;
@@ -243 +267 @@
           Canvas.Font.Height := Trunc(Canvas.Font.Height / TextSize.Width * CellSize.X);
         TextSize := Canvas.TextExtent(ValueStr);
-        Canvas.TextOut(Frame.Left + X * CellSize.X + CellSize.X div 2 -
+        Canvas.TextOut(CellRect.Left + CellSize.X div 2 -
           TextSize.Width div 2,
-          Frame.Top + Y * CellSize.Y + CellSize.Y div 2 - TextSize.Height div 2, ValueStr);
+          CellRect.Top + CellSize.Y div 2 - TextSize.Height div 2, ValueStr);
       end;
     end;
 
-  for Y := 0 to Size.Y - 1 do begin
-    Canvas.MoveTo(Frame.Left, Frame.Top + Y * CellSize.Y);
-    Canvas.LineTo(Frame.Left + Size.X * CellSize.X, Frame.Top + Y * CellSize.Y);
-  end;
-  for X := 0 to Size.X - 1 do begin
-    Canvas.MoveTo(Frame.Left + X * CellSize.X, Frame.Top);
-    Canvas.LineTo(Frame.Left + X * CellSize.X, Frame.Top + Size.Y * CellSize.Y);
-  end;
-  Canvas.Brush.Style := bsClear;
-  Canvas.Rectangle(Frame);
+  // Draw moving cells
+  for Y := 0 to Size.Y - 1 do
+    for X := 0 to Size.X - 1 do
+    if Cells[Y, X].Moving then begin
+      Canvas.Brush.Color := GetCellColor(Cells[Y, X].Value);
+      Canvas.Brush.Style := bsSolid;
+      CellRect := Bounds(
+        Frame.Left + X * CellSize.X + Trunc(Cells[Y, X].Shift.X / 100 * CellSize.X + CellMargin),
+        Frame.Top + Y * CellSize.Y + Trunc(Cells[Y, X].Shift.Y / 100 * CellSize.Y + CellMargin),
+        CellSize.X - 2 * CellMargin, CellSize.Y - 2 * CellMargin);
+      Canvas.FillRect(CellRect);
+      if Cells[Y, X].Value <> 0 then begin
+        ValueStr := IntToStr(Cells[Y, X].Value);
+        Canvas.Brush.Style := bsClear;
+        Canvas.Font.Height := Trunc(CellSize.Y * 0.7); // * (CellSize.X * 0.7) / Canvas.TextWidth(ValueStr));
+        TextSize := Canvas.TextExtent(ValueStr);
+        if TextSize.Width > CellRect.Width then
+          Canvas.Font.Height := Trunc(Canvas.Font.Height / TextSize.Width * CellSize.X);
+        TextSize := Canvas.TextExtent(ValueStr);
+        Canvas.TextOut(CellRect.Left + CellRect.Width div 2 -
+          TextSize.Width div 2,
+          CellRect.Top + CellRect.Height div 2 - TextSize.Height div 2, ValueStr);
+      end;
+    end;
 end;
 
@@ -266 +304 @@
   AreaSize: TPoint;
   Increment: TPoint;
+  MoveDirection: TPoint;
   P: TPoint;
-  PN: TPoint;
+  PNew: TPoint;
   PI: TPoint;
   MovedCount: Integer;
+  X, Y: Integer;
+  Step: Integer;
+  I: Integer;
+const
+  StepCount = 10;
+  AnimationDuration = 30;
 begin
   //Diff := DirectionDiff[Direction];
@@ -277 +322 @@
       AreaSize := Point(Size.X - 2, Size.Y - 1);
       Increment := Point(1, 1);
+      MoveDirection := Point(-1, 0);
     end;
     drUp: begin
@@ -282 +328 @@
       AreaSize := Point(Size.X - 1, Size.Y - 2);
       Increment := Point(1, 1);
+      MoveDirection := Point(0, -1);
     end;
     drRight: begin
@@ -287 +334 @@
       AreaSize := Point(Size.X - 2, Size.Y - 1);
       Increment := Point(-1, 1);
+      MoveDirection := Point(1, 0);
     end;
     drDown: begin
@@ -292 +340 @@
       AreaSize := Point(Size.X - 1, Size.Y - 2);
       Increment := Point(1, -1);
-    end;
-  end;
+      MoveDirection := Point(0, 1);
+    end;
+  end;
+  MovedCount := 0;
   ClearMerged;
-  MovedCount := 0;
-  PI.Y := 0;
-  while PI.Y <= AreaSize.Y do begin
-    PI.X := 0;
-    while PI.X <= AreaSize.X do begin
-      P := Point(StartPoint.X + PI.X * Increment.X, StartPoint.Y + PI.Y * Increment.Y);
-      PN.X := P.X + DirectionDiff[Direction].X;
-      PN.Y := P.Y + DirectionDiff[Direction].Y;
-      while IsValidPos(PN) do begin
-        if (Cells[P.Y, P.X].Value <> 0) then begin
-          if (Cells[PN.Y, PN.X].Value = 0) then begin
-            MoveCell(Cells[P.Y, P.X], Cells[PN.Y, PN.X]);
-            Inc(MovedCount);
-          end else
-          if (not Cells[P.Y, P.X].Merged) and (not Cells[PN.Y, PN.X].Merged) and
-          (Cells[PN.Y, PN.X].Value = Cells[P.Y, P.X].Value) then begin
-            Cells[PN.Y, PN.X].Value := Cells[PN.Y, PN.X].Value + Cells[P.Y, P.X].Value;
-            Cells[PN.Y, PN.X].Merged := True;
-            Cells[P.Y, P.X].Value := 0;
-            Cells[P.Y, P.X].Merged := False;
-            Inc(MovedCount);
+  for I := 0 to Max(Size.X, Size.Y) - 1 do begin
+    PI.Y := 0;
+    for Y := 0 to Size.Y - 1 do
+      for X := 0 to Size.X - 1 do begin
+        Cells[Y, X].NewValue := Cells[Y, X].Value;
+        Cells[Y, X].Moving := False;
+      end;
+
+    while PI.Y <= AreaSize.Y do begin
+      PI.X := 0;
+      while PI.X <= AreaSize.X do begin
+        P := Point(StartPoint.X + PI.X * Increment.X, StartPoint.Y + PI.Y * Increment.Y);
+        PNew.X := P.X + DirectionDiff[Direction].X;
+        PNew.Y := P.Y + DirectionDiff[Direction].Y;
+        if IsValidPos(PNew) then begin
+          if (Cells[P.Y, P.X].NewValue <> 0) then begin
+            if (Cells[PNew.Y, PNew.X].NewValue = 0) then begin
+              Cells[P.Y, P.X].Moving := True;
+              Cells[PNew.Y, PNew.X].NewValue := Cells[P.Y, P.X].NewValue;
+              Cells[PNew.Y, PNew.X].Merged := Cells[P.Y, P.X].Merged;
+              Cells[P.Y, P.X].NewValue := 0;
+              Cells[P.Y, P.X].Merged := False;
+              Inc(MovedCount);
+            end else
+            if (not Cells[P.Y, P.X].Merged) and (not Cells[PNew.Y, PNew.X].Merged) and
+            (Cells[PNew.Y, PNew.X].NewValue = Cells[P.Y, P.X].NewValue) then begin
+              Cells[P.Y, P.X].Moving := True;
+              Cells[PNew.Y, PNew.X].NewValue := Cells[PNew.Y, PNew.X].NewValue + Cells[P.Y, P.X].NewValue;
+              Cells[PNew.Y, PNew.X].Merged := True;
+              Cells[P.Y, P.X].NewValue := 0;
+              Cells[P.Y, P.X].Merged := False;
+              Inc(MovedCount);
+            end;
           end;
+          P.X := PNew.X;
+          P.Y := PNew.Y;
+          PNew.X := P.X + DirectionDiff[Direction].X;
+          PNew.Y := P.Y + DirectionDiff[Direction].Y;
         end;
-        P.X := PN.X;
-        P.Y := PN.Y;
-        PN.X := P.X + DirectionDiff[Direction].X;
-        PN.Y := P.Y + DirectionDiff[Direction].Y;
+        Inc(PI.X);
       end;
-      Inc(PI.X);
-    end;
-    Inc(PI.Y);
-  end;
-  DoChange;
+      Inc(PI.Y);
+    end;
+    for Step := 0 to StepCount - 2 do begin
+      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));
+        end;
+      DoChange;
+      Application.ProcessMessages;
+      Sleep(AnimationDuration div StepCount);
+    end;
+    for Y := 0 to Size.Y - 1 do
+      for X := 0 to Size.X - 1 do begin
+        Cells[Y, X].Value := Cells[Y, X].NewValue;
+        Cells[Y, X].Shift := Point(0, 0);
+      end;
+    DoChange;
+  end;
   Result := MovedCount;
 end;