h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-08 21:22:56 +08:00
Code Issues Releases Wiki Activity

Revert position offset change for separate pull

Browse Source
This commit is contained in:
voidedWarranties 2020-03-08 14:40:36 -07:00
parent 22dd93a4f6
commit 4624582703
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,10 +92,8 @@ namespace osu.Game.Beatmaps.Formats
{ {
var offset = Parsing.ParseInt(split[1]); var offset = Parsing.ParseInt(split[1]);
var filename = CleanFilename(split[2]); var filename = CleanFilename(split[2]);
var xOffset = split.Length > 3 ? Parsing.ParseInt(split[3]) : 0;
var yOffset = split.Length > 4 ? Parsing.ParseInt(split[4]) : 0;
storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset, xOffset, yOffset)); storyboard.GetLayer(LegacyStoryLayer.Video).Add(new StoryboardVideo(filename, offset));
break; break;
} }

4
osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Graphics.Video;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osuTK;
namespace osu.Game.Storyboards.Drawables namespace osu.Game.Storyboards.Drawables
{ {
@ -58,8 +57,7 @@ namespace osu.Game.Storyboards.Drawables
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
AlwaysPresent = true, AlwaysPresent = true,
Alpha = 0, Alpha = 0
Position = new Vector2(Video.XOffset, Video.YOffset)
}); });
videoClock = new ManualClock(); videoClock = new ManualClock();

8
osu.Game/Storyboards/StoryboardVideo.cs
View File

@ -14,16 +14,10 @@ namespace osu.Game.Storyboards
public double StartTime { get; } public double StartTime { get; }
public int XOffset { get; } public StoryboardVideo(string path, int offset)
public int YOffset { get; }
public StoryboardVideo(string path, int offset, int xOffset, int yOffset)
{ {
Path = path; Path = path;
StartTime = offset; StartTime = offset;
XOffset = xOffset;
YOffset = yOffset;
} }
public Drawable CreateDrawable() => new DrawableStoryboardVideo(this); public Drawable CreateDrawable() => new DrawableStoryboardVideo(this);