From c1649b76d638dbe0f32217be7027e7a98b5b6026 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Fri, 8 Mar 2024 21:33:46 +0300 Subject: [PATCH] Reorder command properties to match general format I had them shuffled around in the middle of the refactor. --- .../TestSceneDrawableStoryboardSprite.cs | 2 +- .../Visual/Gameplay/TestSceneLeadIn.cs | 12 +++--- .../Gameplay/TestSceneStoryboardWithOutro.cs | 2 +- .../TestSceneMultiSpectatorScreen.cs | 2 +- .../Formats/LegacyStoryboardDecoder.cs | 28 ++++++------- .../Commands/StoryboardAlphaCommand.cs | 4 +- .../StoryboardBlendingParametersCommand.cs | 4 +- .../Commands/StoryboardColourCommand.cs | 4 +- .../Storyboards/Commands/StoryboardCommand.cs | 2 +- .../Commands/StoryboardCommandGroup.cs | 40 +++++++++---------- .../Commands/StoryboardFlipHCommand.cs | 4 +- .../Commands/StoryboardFlipVCommand.cs | 4 +- .../Commands/StoryboardLoopingGroup.cs | 2 +- .../Commands/StoryboardRotationCommand.cs | 4 +- .../Commands/StoryboardScaleCommand.cs | 4 +- .../Commands/StoryboardVectorScaleCommand.cs | 4 +- .../Commands/StoryboardXCommand.cs | 4 +- .../Commands/StoryboardYCommand.cs | 4 +- 18 files changed, 65 insertions(+), 65 deletions(-) diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs index 6209b42cbb..6bfa141d85 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableStoryboardSprite.cs @@ -176,7 +176,7 @@ namespace osu.Game.Tests.Visual.Gameplay var sprite = new StoryboardSprite(lookupName, origin, initialPosition); var loop = sprite.AddLoopingGroup(Time.Current, 100); - loop.AddAlpha(0, 10000, 1, 1, Easing.None); + loop.AddAlpha(Easing.None, 0, 10000, 1, 1); layer.Elements.Clear(); layer.Add(sprite); diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs index b2196e77b4..5a71369976 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs @@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Gameplay var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero); - sprite.Commands.AddAlpha(firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1, Easing.None); + sprite.Commands.AddAlpha(Easing.None, firstStoryboardEvent, firstStoryboardEvent + 500, 0, 1); storyboard.GetLayer("Background").Add(sprite); @@ -73,17 +73,17 @@ namespace osu.Game.Tests.Visual.Gameplay var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero); // these should be ignored as we have an alpha visibility blocker proceeding this command. - sprite.Commands.AddScale(loop_start_time, -18000, 0, 1, Easing.None); + sprite.Commands.AddScale(Easing.None, loop_start_time, -18000, 0, 1); var loopGroup = sprite.AddLoopingGroup(loop_start_time, 50); - loopGroup.AddScale(loop_start_time, -18000, 0, 1, Easing.None); + loopGroup.AddScale(Easing.None, loop_start_time, -18000, 0, 1); var target = addEventToLoop ? loopGroup : sprite.Commands; double loopRelativeOffset = addEventToLoop ? -loop_start_time : 0; - target.AddAlpha(loopRelativeOffset + firstStoryboardEvent, loopRelativeOffset + firstStoryboardEvent + 500, 0, 1, Easing.None); + target.AddAlpha(Easing.None, loopRelativeOffset + firstStoryboardEvent, loopRelativeOffset + firstStoryboardEvent + 500, 0, 1); // these should be ignored due to being in the future. - sprite.Commands.AddAlpha(18000, 20000, 0, 1, Easing.None); - loopGroup.AddAlpha(38000, 40000, 0, 1, Easing.None); + sprite.Commands.AddAlpha(Easing.None, 18000, 20000, 0, 1); + loopGroup.AddAlpha(Easing.None, 38000, 40000, 0, 1); storyboard.GetLayer("Background").Add(sprite); diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs index 8bdb7297fe..aff6139c08 100644 --- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs +++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs @@ -216,7 +216,7 @@ namespace osu.Game.Tests.Visual.Gameplay { var storyboard = new Storyboard(); var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero); - sprite.Commands.AddAlpha(0, duration, 1, 0, Easing.None); + sprite.Commands.AddAlpha(Easing.None, 0, duration, 1, 0); storyboard.GetLayer("Background").Add(sprite); return storyboard; } diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs index 7cd2e2fdaa..2b17f91e68 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs @@ -424,7 +424,7 @@ namespace osu.Game.Tests.Visual.Multiplayer public void TestIntroStoryboardElement() => testLeadIn(b => { var sprite = new StoryboardSprite("unknown", Anchor.TopLeft, Vector2.Zero); - sprite.Commands.AddAlpha(-2000, 0, 0, 1, Easing.None); + sprite.Commands.AddAlpha(Easing.None, -2000, 0, 0, 1); b.Storyboard.GetLayer("Background").Add(sprite); }); diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs index 739e81a2fe..195d59d0eb 100644 --- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs +++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs @@ -204,7 +204,7 @@ namespace osu.Game.Beatmaps.Formats { float startValue = Parsing.ParseFloat(split[4]); float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; - currentCommandsGroup?.AddAlpha(startTime, endTime, startValue, endValue, easing); + currentCommandsGroup?.AddAlpha(easing, startTime, endTime, startValue, endValue); break; } @@ -212,7 +212,7 @@ namespace osu.Game.Beatmaps.Formats { float startValue = Parsing.ParseFloat(split[4]); float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; - currentCommandsGroup?.AddScale(startTime, endTime, startValue, endValue, easing); + currentCommandsGroup?.AddScale(easing, startTime, endTime, startValue, endValue); break; } @@ -222,7 +222,7 @@ namespace osu.Game.Beatmaps.Formats float startY = Parsing.ParseFloat(split[5]); float endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX; float endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY; - currentCommandsGroup?.AddVectorScale(startTime, endTime, new Vector2(startX, startY), new Vector2(endX, endY), easing); + currentCommandsGroup?.AddVectorScale(easing, startTime, endTime, new Vector2(startX, startY), new Vector2(endX, endY)); break; } @@ -230,7 +230,7 @@ namespace osu.Game.Beatmaps.Formats { float startValue = Parsing.ParseFloat(split[4]); float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; - currentCommandsGroup?.AddRotation(startTime, endTime, float.RadiansToDegrees(startValue), float.RadiansToDegrees(endValue), easing); + currentCommandsGroup?.AddRotation(easing, startTime, endTime, float.RadiansToDegrees(startValue), float.RadiansToDegrees(endValue)); break; } @@ -240,8 +240,8 @@ namespace osu.Game.Beatmaps.Formats float startY = Parsing.ParseFloat(split[5]); float endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX; float endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY; - currentCommandsGroup?.AddX(startTime, endTime, startX, endX, easing); - currentCommandsGroup?.AddY(startTime, endTime, startY, endY, easing); + currentCommandsGroup?.AddX(easing, startTime, endTime, startX, endX); + currentCommandsGroup?.AddY(easing, startTime, endTime, startY, endY); break; } @@ -249,7 +249,7 @@ namespace osu.Game.Beatmaps.Formats { float startValue = Parsing.ParseFloat(split[4]); float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; - currentCommandsGroup?.AddX(startTime, endTime, startValue, endValue, easing); + currentCommandsGroup?.AddX(easing, startTime, endTime, startValue, endValue); break; } @@ -257,7 +257,7 @@ namespace osu.Game.Beatmaps.Formats { float startValue = Parsing.ParseFloat(split[4]); float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; - currentCommandsGroup?.AddY(startTime, endTime, startValue, endValue, easing); + currentCommandsGroup?.AddY(easing, startTime, endTime, startValue, endValue); break; } @@ -269,9 +269,9 @@ namespace osu.Game.Beatmaps.Formats float endRed = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startRed; float endGreen = split.Length > 8 ? Parsing.ParseFloat(split[8]) : startGreen; float endBlue = split.Length > 9 ? Parsing.ParseFloat(split[9]) : startBlue; - currentCommandsGroup?.AddColour(startTime, endTime, + currentCommandsGroup?.AddColour(easing, startTime, endTime, new Color4(startRed / 255f, startGreen / 255f, startBlue / 255f, 1), - new Color4(endRed / 255f, endGreen / 255f, endBlue / 255f, 1), easing); + new Color4(endRed / 255f, endGreen / 255f, endBlue / 255f, 1)); break; } @@ -282,16 +282,16 @@ namespace osu.Game.Beatmaps.Formats switch (type) { case "A": - currentCommandsGroup?.AddBlendingParameters(startTime, endTime, BlendingParameters.Additive, - startTime == endTime ? BlendingParameters.Additive : BlendingParameters.Inherit, easing); + currentCommandsGroup?.AddBlendingParameters(easing, startTime, endTime, BlendingParameters.Additive, + startTime == endTime ? BlendingParameters.Additive : BlendingParameters.Inherit); break; case "H": - currentCommandsGroup?.AddFlipH(startTime, endTime, true, startTime == endTime, easing); + currentCommandsGroup?.AddFlipH(easing, startTime, endTime, true, startTime == endTime); break; case "V": - currentCommandsGroup?.AddFlipV(startTime, endTime, true, startTime == endTime, easing); + currentCommandsGroup?.AddFlipV(easing, startTime, endTime, true, startTime == endTime); break; } diff --git a/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs b/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs index f4a90b372a..1c17da7592 100644 --- a/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardAlphaCommand.cs @@ -8,8 +8,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardAlphaCommand : StoryboardCommand { - public StoryboardAlphaCommand(double startTime, double endTime, float startValue, float endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardAlphaCommand(Easing easing, double startTime, double endTime, float startValue, float endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs b/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs index 3e2e8bb0e8..9ac6613708 100644 --- a/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardBlendingParametersCommand.cs @@ -8,8 +8,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardBlendingParametersCommand : StoryboardCommand { - public StoryboardBlendingParametersCommand(double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardBlendingParametersCommand(Easing easing, double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs b/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs index 66390eb305..da8a20647c 100644 --- a/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardColourCommand.cs @@ -9,8 +9,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardColourCommand : StoryboardCommand { - public StoryboardColourCommand(double startTime, double endTime, Color4 startValue, Color4 endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardColourCommand(Easing easing, double startTime, double endTime, Color4 startValue, Color4 endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardCommand.cs b/osu.Game/Storyboards/Commands/StoryboardCommand.cs index 4f2f0f04a2..60c28e7833 100644 --- a/osu.Game/Storyboards/Commands/StoryboardCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardCommand.cs @@ -19,7 +19,7 @@ namespace osu.Game.Storyboards.Commands public double Duration => EndTime - StartTime; - protected StoryboardCommand(double startTime, double endTime, T startValue, T endValue, Easing easing) + protected StoryboardCommand(Easing easing, double startTime, double endTime, T startValue, T endValue) { if (endTime < startTime) endTime = startTime; diff --git a/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs b/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs index fb847d2e44..40dd8f78e6 100644 --- a/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs +++ b/osu.Game/Storyboards/Commands/StoryboardCommandGroup.cs @@ -45,35 +45,35 @@ namespace osu.Game.Storyboards.Commands [JsonIgnore] public bool HasCommands { get; private set; } - public void AddX(double startTime, double endTime, float startValue, float endValue, Easing easing) - => AddCommand(X, new StoryboardXCommand(startTime, endTime, startValue, endValue, easing)); + public void AddX(Easing easing, double startTime, double endTime, float startValue, float endValue) + => AddCommand(X, new StoryboardXCommand(easing, startTime, endTime, startValue, endValue)); - public void AddY(double startTime, double endTime, float startValue, float endValue, Easing easing) - => AddCommand(Y, new StoryboardYCommand(startTime, endTime, startValue, endValue, easing)); + public void AddY(Easing easing, double startTime, double endTime, float startValue, float endValue) + => AddCommand(Y, new StoryboardYCommand(easing, startTime, endTime, startValue, endValue)); - public void AddScale(double startTime, double endTime, float startValue, float endValue, Easing easing) - => AddCommand(Scale, new StoryboardScaleCommand(startTime, endTime, startValue, endValue, easing)); + public void AddScale(Easing easing, double startTime, double endTime, float startValue, float endValue) + => AddCommand(Scale, new StoryboardScaleCommand(easing, startTime, endTime, startValue, endValue)); - public void AddVectorScale(double startTime, double endTime, Vector2 startValue, Vector2 endValue, Easing easing) - => AddCommand(VectorScale, new StoryboardVectorScaleCommand(startTime, endTime, startValue, endValue, easing)); + public void AddVectorScale(Easing easing, double startTime, double endTime, Vector2 startValue, Vector2 endValue) + => AddCommand(VectorScale, new StoryboardVectorScaleCommand(easing, startTime, endTime, startValue, endValue)); - public void AddRotation(double startTime, double endTime, float startValue, float endValue, Easing easing) - => AddCommand(Rotation, new StoryboardRotationCommand(startTime, endTime, startValue, endValue, easing)); + public void AddRotation(Easing easing, double startTime, double endTime, float startValue, float endValue) + => AddCommand(Rotation, new StoryboardRotationCommand(easing, startTime, endTime, startValue, endValue)); - public void AddColour(double startTime, double endTime, Color4 startValue, Color4 endValue, Easing easing) - => AddCommand(Colour, new StoryboardColourCommand(startTime, endTime, startValue, endValue, easing)); + public void AddColour(Easing easing, double startTime, double endTime, Color4 startValue, Color4 endValue) + => AddCommand(Colour, new StoryboardColourCommand(easing, startTime, endTime, startValue, endValue)); - public void AddAlpha(double startTime, double endTime, float startValue, float endValue, Easing easing) - => AddCommand(Alpha, new StoryboardAlphaCommand(startTime, endTime, startValue, endValue, easing)); + public void AddAlpha(Easing easing, double startTime, double endTime, float startValue, float endValue) + => AddCommand(Alpha, new StoryboardAlphaCommand(easing, startTime, endTime, startValue, endValue)); - public void AddBlendingParameters(double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue, Easing easing) - => AddCommand(BlendingParameters, new StoryboardBlendingParametersCommand(startTime, endTime, startValue, endValue, easing)); + public void AddBlendingParameters(Easing easing, double startTime, double endTime, BlendingParameters startValue, BlendingParameters endValue) + => AddCommand(BlendingParameters, new StoryboardBlendingParametersCommand(easing, startTime, endTime, startValue, endValue)); - public void AddFlipH(double startTime, double endTime, bool startValue, bool endValue, Easing easing) - => AddCommand(FlipH, new StoryboardFlipHCommand(startTime, endTime, startValue, endValue, easing)); + public void AddFlipH(Easing easing, double startTime, double endTime, bool startValue, bool endValue) + => AddCommand(FlipH, new StoryboardFlipHCommand(easing, startTime, endTime, startValue, endValue)); - public void AddFlipV(double startTime, double endTime, bool startValue, bool endValue, Easing easing) - => AddCommand(FlipV, new StoryboardFlipVCommand(startTime, endTime, startValue, endValue, easing)); + public void AddFlipV(Easing easing, double startTime, double endTime, bool startValue, bool endValue) + => AddCommand(FlipV, new StoryboardFlipVCommand(easing, startTime, endTime, startValue, endValue)); /// /// Adds the given storyboard to the target . diff --git a/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs b/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs index 26aef23226..fa07ff6645 100644 --- a/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardFlipHCommand.cs @@ -9,8 +9,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardFlipHCommand : StoryboardCommand { - public StoryboardFlipHCommand(double startTime, double endTime, bool startValue, bool endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardFlipHCommand(Easing easing, double startTime, double endTime, bool startValue, bool endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs b/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs index 88423da2af..fa6a170c25 100644 --- a/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardFlipVCommand.cs @@ -9,8 +9,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardFlipVCommand : StoryboardCommand { - public StoryboardFlipVCommand(double startTime, double endTime, bool startValue, bool endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardFlipVCommand(Easing easing, double startTime, double endTime, bool startValue, bool endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs b/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs index e97de84ab7..a886998679 100644 --- a/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs +++ b/osu.Game/Storyboards/Commands/StoryboardLoopingGroup.cs @@ -43,7 +43,7 @@ namespace osu.Game.Storyboards.Commands // In an ideal world, we would multiply the command duration by TotalIterations in command end time. // Unfortunately this would clash with how stable handled end times, and results in some storyboards playing outro // sequences for minutes or hours. - : base(loopingGroup.loopStartTime + command.StartTime, loopingGroup.loopStartTime + command.EndTime, command.StartValue, command.EndValue, command.Easing) + : base(command.Easing, loopingGroup.loopStartTime + command.StartTime, loopingGroup.loopStartTime + command.EndTime, command.StartValue, command.EndValue) { this.command = command; this.loopingGroup = loopingGroup; diff --git a/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs b/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs index 4347dc9d77..7e097fce25 100644 --- a/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardRotationCommand.cs @@ -8,8 +8,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardRotationCommand : StoryboardCommand { - public StoryboardRotationCommand(double startTime, double endTime, float startValue, float endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardRotationCommand(Easing easing, double startTime, double endTime, float startValue, float endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs b/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs index b0f33fd6b8..832533af5e 100644 --- a/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardScaleCommand.cs @@ -9,8 +9,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardScaleCommand : StoryboardCommand { - public StoryboardScaleCommand(double startTime, double endTime, float startValue, float endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardScaleCommand(Easing easing, double startTime, double endTime, float startValue, float endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs b/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs index 5d3fef5948..06983a1590 100644 --- a/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardVectorScaleCommand.cs @@ -10,8 +10,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardVectorScaleCommand : StoryboardCommand { - public StoryboardVectorScaleCommand(double startTime, double endTime, Vector2 startValue, Vector2 endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardVectorScaleCommand(Easing easing, double startTime, double endTime, Vector2 startValue, Vector2 endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardXCommand.cs b/osu.Game/Storyboards/Commands/StoryboardXCommand.cs index 7df9a75768..d52e9c8a05 100644 --- a/osu.Game/Storyboards/Commands/StoryboardXCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardXCommand.cs @@ -8,8 +8,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardXCommand : StoryboardCommand { - public StoryboardXCommand(double startTime, double endTime, float startValue, float endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardXCommand(Easing easing, double startTime, double endTime, float startValue, float endValue) + : base(easing, startTime, endTime, startValue, endValue) { } diff --git a/osu.Game/Storyboards/Commands/StoryboardYCommand.cs b/osu.Game/Storyboards/Commands/StoryboardYCommand.cs index d7dc32a0f3..90dfe4d995 100644 --- a/osu.Game/Storyboards/Commands/StoryboardYCommand.cs +++ b/osu.Game/Storyboards/Commands/StoryboardYCommand.cs @@ -8,8 +8,8 @@ namespace osu.Game.Storyboards.Commands { public class StoryboardYCommand : StoryboardCommand { - public StoryboardYCommand(double startTime, double endTime, float startValue, float endValue, Easing easing) - : base(startTime, endTime, startValue, endValue, easing) + public StoryboardYCommand(Easing easing, double startTime, double endTime, float startValue, float endValue) + : base(easing, startTime, endTime, startValue, endValue) { }