h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Use more direct way to apply transforms

Browse Source
This commit is contained in:
Andrei Zavatski 2024-03-03 20:46:58 +03:00
parent e1744df2b7
commit c05007804f
4 changed files with 75 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
View File

@ -212,7 +212,7 @@ namespace osu.Game.Beatmaps.Formats
{ {
float startValue = Parsing.ParseFloat(split[4]); float startValue = Parsing.ParseFloat(split[4]);
float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue; float endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
timelineGroup?.Scale.Add(easing, startTime, endTime, startValue, endValue); timelineGroup?.Scale.Add(easing, startTime, endTime, new Vector2(startValue), new Vector2(endValue));
break; break;
} }

10
osu.Game/Storyboards/CommandTimeline.cs
View File

@ -24,6 +24,13 @@ namespace osu.Game.Storyboards
public T StartValue { get; private set; } public T StartValue { get; private set; }
public T EndValue { get; private set; } public T EndValue { get; private set; }
public string PropertyName { get; }
public CommandTimeline(string propertyName)
{
PropertyName = propertyName;
}
public void Add(Easing easing, double startTime, double endTime, T startValue, T endValue) public void Add(Easing easing, double startTime, double endTime, T startValue, T endValue)
{ {
if (endTime < startTime) if (endTime < startTime)
@ -31,7 +38,7 @@ namespace osu.Game.Storyboards
endTime = startTime; endTime = startTime;
} }
commands.Add(new TypedCommand { Easing = easing, StartTime = startTime, EndTime = endTime, StartValue = startValue, EndValue = endValue }); commands.Add(new TypedCommand { Easing = easing, StartTime = startTime, EndTime = endTime, StartValue = startValue, EndValue = endValue, PropertyName = PropertyName });
if (startTime < StartTime) if (startTime < StartTime)
{ {
@ -55,6 +62,7 @@ namespace osu.Game.Storyboards
public double StartTime { get; set; } public double StartTime { get; set; }
public double EndTime { get; set; } public double EndTime { get; set; }
public double Duration => EndTime - StartTime; public double Duration => EndTime - StartTime;
public string PropertyName { get; set; }
public T StartValue; public T StartValue;
public T EndValue; public T EndValue;

23
osu.Game/Storyboards/CommandTimelineGroup.cs
View File

@ -3,11 +3,11 @@
using System; using System;
using osuTK; using osuTK;
using osuTK.Graphics;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Graphics.Colour;
namespace osu.Game.Storyboards namespace osu.Game.Storyboards
{ {
@ -15,16 +15,16 @@ namespace osu.Game.Storyboards
public class CommandTimelineGroup public class CommandTimelineGroup
{ {
public CommandTimeline<float> X = new CommandTimeline<float>(); public CommandTimeline<float> X = new CommandTimeline<float>("X");
public CommandTimeline<float> Y = new CommandTimeline<float>(); public CommandTimeline<float> Y = new CommandTimeline<float>("Y");
public CommandTimeline<float> Scale = new CommandTimeline<float>(); public CommandTimeline<Vector2> Scale = new CommandTimeline<Vector2>("Scale");
public CommandTimeline<Vector2> VectorScale = new CommandTimeline<Vector2>(); public CommandTimeline<Vector2> VectorScale = new CommandTimeline<Vector2>("VectorScale");
public CommandTimeline<float> Rotation = new CommandTimeline<float>(); public CommandTimeline<float> Rotation = new CommandTimeline<float>("Rotation");
public CommandTimeline<Color4> Colour = new CommandTimeline<Color4>(); public CommandTimeline<ColourInfo> Colour = new CommandTimeline<ColourInfo>("Colour");
public CommandTimeline<float> Alpha = new CommandTimeline<float>(); public CommandTimeline<float> Alpha = new CommandTimeline<float>("Alpha");
public CommandTimeline<BlendingParameters> BlendingParameters = new CommandTimeline<BlendingParameters>(); public CommandTimeline<BlendingParameters> BlendingParameters = new CommandTimeline<BlendingParameters>("Blending");
public CommandTimeline<bool> FlipH = new CommandTimeline<bool>(); public CommandTimeline<bool> FlipH = new CommandTimeline<bool>("FlipH");
public CommandTimeline<bool> FlipV = new CommandTimeline<bool>(); public CommandTimeline<bool> FlipV = new CommandTimeline<bool>("FlipV");
private readonly ICommandTimeline[] timelines; private readonly ICommandTimeline[] timelines;
@ -109,6 +109,7 @@ namespace osu.Game.Storyboards
EndTime = offset + command.EndTime, EndTime = offset + command.EndTime,
StartValue = command.StartValue, StartValue = command.StartValue,
EndValue = command.EndValue, EndValue = command.EndValue,
PropertyName = command.PropertyName
}); });
} }

77
osu.Game/Storyboards/StoryboardSprite.cs
View File

@ -98,8 +98,6 @@ namespace osu.Game.Storyboards
private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value); private delegate void DrawablePropertyInitializer<in T>(Drawable drawable, T value);
private delegate void DrawableTransformer<in T>(Drawable drawable, T value, double duration, Easing easing);
public StoryboardSprite(string path, Anchor origin, Vector2 initialPosition) public StoryboardSprite(string path, Anchor origin, Vector2 initialPosition)
{ {
Path = path; Path = path;
@ -132,27 +130,23 @@ namespace osu.Game.Storyboards
List<IGeneratedCommand> generated = new List<IGeneratedCommand>(); List<IGeneratedCommand> generated = new List<IGeneratedCommand>();
generateCommands(generated, getCommands(g => g.X, triggeredGroups), (d, value) => d.X = value, (d, value, duration, easing) => d.MoveToX(value, duration, easing)); generateCommands(generated, getCommands(g => g.X, triggeredGroups), (d, value) => d.X = value);
generateCommands(generated, getCommands(g => g.Y, triggeredGroups), (d, value) => d.Y = value, (d, value, duration, easing) => d.MoveToY(value, duration, easing)); generateCommands(generated, getCommands(g => g.Y, triggeredGroups), (d, value) => d.Y = value);
generateCommands(generated, getCommands(g => g.Scale, triggeredGroups), (d, value) => d.Scale = new Vector2(value), (d, value, duration, easing) => d.ScaleTo(value, duration, easing)); generateCommands(generated, getCommands(g => g.Scale, triggeredGroups), (d, value) => d.Scale = value);
generateCommands(generated, getCommands(g => g.Rotation, triggeredGroups), (d, value) => d.Rotation = value, (d, value, duration, easing) => d.RotateTo(value, duration, easing)); generateCommands(generated, getCommands(g => g.Rotation, triggeredGroups), (d, value) => d.Rotation = value);
generateCommands(generated, getCommands(g => g.Colour, triggeredGroups), (d, value) => d.Colour = value, (d, value, duration, easing) => d.FadeColour(value, duration, easing)); generateCommands(generated, getCommands(g => g.Colour, triggeredGroups), (d, value) => d.Colour = value);
generateCommands(generated, getCommands(g => g.Alpha, triggeredGroups), (d, value) => d.Alpha = value, (d, value, duration, easing) => d.FadeTo(value, duration, easing)); generateCommands(generated, getCommands(g => g.Alpha, triggeredGroups), (d, value) => d.Alpha = value);
generateCommands(generated, getCommands(g => g.BlendingParameters, triggeredGroups), (d, value) => d.Blending = value, (d, value, duration, _) => d.TransformBlendingMode(value, duration), generateCommands(generated, getCommands(g => g.BlendingParameters, triggeredGroups), (d, value) => d.Blending = value, false);
false);
if (drawable is IVectorScalable vectorScalable) if (drawable is IVectorScalable vectorScalable)
{ {
generateCommands(generated, getCommands(g => g.VectorScale, triggeredGroups), (_, value) => vectorScalable.VectorScale = value, generateCommands(generated, getCommands(g => g.VectorScale, triggeredGroups), (_, value) => vectorScalable.VectorScale = value);
(_, value, duration, easing) => vectorScalable.VectorScaleTo(value, duration, easing));
} }
if (drawable is IFlippable flippable) if (drawable is IFlippable flippable)
{ {
generateCommands(generated, getCommands(g => g.FlipH, triggeredGroups), (_, value) => flippable.FlipH = value, (_, value, duration, _) => flippable.TransformFlipH(value, duration), generateCommands(generated, getCommands(g => g.FlipH, triggeredGroups), (_, value) => flippable.FlipH = value, false);
false); generateCommands(generated, getCommands(g => g.FlipV, triggeredGroups), (_, value) => flippable.FlipV = value, false);
generateCommands(generated, getCommands(g => g.FlipV, triggeredGroups), (_, value) => flippable.FlipV = value, (_, value, duration, _) => flippable.TransformFlipV(value, duration),
false);
} }
foreach (var command in generated.OrderBy(g => g.StartTime)) foreach (var command in generated.OrderBy(g => g.StartTime))
@ -160,7 +154,7 @@ namespace osu.Game.Storyboards
} }
private void generateCommands<T>(List<IGeneratedCommand> resultList, IEnumerable<CommandTimeline<T>.TypedCommand> commands, private void generateCommands<T>(List<IGeneratedCommand> resultList, IEnumerable<CommandTimeline<T>.TypedCommand> commands,
DrawablePropertyInitializer<T> initializeProperty, DrawableTransformer<T> transform, bool alwaysInitialize = true) DrawablePropertyInitializer<T> initializeProperty, bool alwaysInitialize = true)
{ {
bool initialized = false; bool initialized = false;
@ -175,7 +169,7 @@ namespace osu.Game.Storyboards
initialized = true; initialized = true;
} }
resultList.Add(new GeneratedCommand<T>(command, initFunc, transform)); resultList.Add(new GeneratedCommand<T>(command, initFunc));
} }
} }
@ -209,24 +203,59 @@ namespace osu.Game.Storyboards
public double StartTime => command.StartTime; public double StartTime => command.StartTime;
private readonly DrawablePropertyInitializer<T>? initializeProperty; private readonly DrawablePropertyInitializer<T>? initializeProperty;
private readonly DrawableTransformer<T> transform;
private readonly CommandTimeline<T>.TypedCommand command; private readonly CommandTimeline<T>.TypedCommand command;
public GeneratedCommand(CommandTimeline<T>.TypedCommand command, DrawablePropertyInitializer<T>? initializeProperty, DrawableTransformer<T> transform) public GeneratedCommand(CommandTimeline<T>.TypedCommand command, DrawablePropertyInitializer<T>? initializeProperty)
{ {
this.command = command; this.command = command;
this.initializeProperty = initializeProperty; this.initializeProperty = initializeProperty;
this.transform = transform;
} }
public void ApplyTo(Drawable drawable) public void ApplyTo(Drawable drawable)
{ {
initializeProperty?.Invoke(drawable, command.StartValue); initializeProperty?.Invoke(drawable, command.StartValue);
using (drawable.BeginAbsoluteSequence(command.StartTime)) switch (command.PropertyName)
{ {
transform(drawable, command.StartValue, 0, Easing.None); case "VectorScale":
transform(drawable, command.EndValue, command.Duration, command.Easing); using (drawable.BeginAbsoluteSequence(command.StartTime))
{
((IVectorScalable)drawable).TransformTo(command.PropertyName, command.StartValue).Then().TransformTo(command.PropertyName, command.EndValue, command.Duration, command.Easing);
}
break;
case "FlipH":
using (drawable.BeginAbsoluteSequence(command.StartTime))
{
((IFlippable)drawable).TransformTo(command.PropertyName, command.StartValue).Delay(command.Duration).TransformTo(command.PropertyName, command.EndValue);
}
break;
case "FlipV":
using (drawable.BeginAbsoluteSequence(command.StartTime))
{
((IFlippable)drawable).TransformTo(command.PropertyName, command.StartValue).Delay(command.Duration).TransformTo(command.PropertyName, command.EndValue);
}
break;
case "Blending":
using (drawable.BeginAbsoluteSequence(command.StartTime))
{
drawable.TransformTo(command.PropertyName, command.StartValue).Delay(command.Duration).TransformTo(command.PropertyName, command.EndValue);
}
break;
default:
using (drawable.BeginAbsoluteSequence(command.StartTime))
{
drawable.TransformTo(command.PropertyName, command.StartValue).Then().TransformTo(command.PropertyName, command.EndValue, command.Duration, command.Easing);
}
break;
} }
} }
} }