sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'animated-legacy-skins' into animated-slider-ball

Browse Source
This commit is contained in:
Dean Herbert
2019-08-20 18:14:17 +09:00
parent 84530b7839 7d668c81fc
commit 4bffb0df84
15 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Skinning/LegacySkin.cs
View File

@ -164,22 +164,33 @@ namespace osu.Game.Skinning
Texture getFrameTexture(int frame) => GetTexture($"{componentName}{animationSeparator}{frame}");
if (animatable && (texture = getFrameTexture(0)) != null)
TextureAnimation animation = null;
if (animatable)
{
var animation = new TextureAnimation { DefaultFrameLength = default_frame_time };
for (int i = 1; texture != null; i++)
for (int i = 0;; i++)
{
if ((texture = getFrameTexture(i)) == null)
break;
if (animation == null)
animation = new TextureAnimation
{
DefaultFrameLength = default_frame_time,
Repeat = looping
};
animation.AddFrame(texture);
texture = getFrameTexture(i);
}
animation.Repeat = looping;
return animation;
}
return (texture = GetTexture(componentName)) == null ? null : new Sprite { Texture = texture };
if (animation != null)
return animation;
if ((texture = GetTexture(componentName)) != null)
return new Sprite { Texture = texture };
return null;
}
public override Texture GetTexture(string componentName)