RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-02 01:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17701 from peppy/fix-storyboard-animation-sizing

Browse Source 
Fix storyboard animations getting incorrect positioning due to size not being set
This commit is contained in:
Dan Balasescu 2022-04-07 17:00:39 +09:00 committed by GitHub
commit 5af93bd85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Storyboards/Drawables/DrawableStoryboardAnimation.cs
View File

@ -5,8 +5,10 @@ using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Animations; using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Skinning;
using osuTK; using osuTK;
namespace osu.Game.Storyboards.Drawables namespace osu.Game.Storyboards.Drawables
@ -88,6 +90,14 @@ namespace osu.Game.Storyboards.Drawables
LifetimeEnd = animation.EndTime; LifetimeEnd = animation.EndTime;
} }
protected override Vector2 GetCurrentDisplaySize()
{
Texture texture = (CurrentFrame as Sprite)?.Texture
?? ((CurrentFrame as SkinnableSprite)?.Drawable as Sprite)?.Texture;
return new Vector2(texture?.DisplayWidth ?? 0, texture?.DisplayHeight ?? 0);
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textureStore, Storyboard storyboard) private void load(TextureStore textureStore, Storyboard storyboard)
{ {