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

Fix incorrect frame length for hit explosions

Browse Source
This commit is contained in:
smoogipoo 2020-04-02 22:55:54 +09:00
parent 2a6c0de225
commit 47e2ff5ce6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Rulesets.Mania/Skinning/LegacyHitExplosion.cs
View File

@ -32,7 +32,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value float explosionScale = GetManiaSkinConfig<float>(skin, LegacyManiaSkinConfigurationLookups.ExplosionScale)?.Value
?? 1; ?? 1;
explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true).With(d => // Create a temporary animation to retrieve the number of frames, in an effort to calculate the intended frame length.
// This animation is discarded and re-queried with the appropriate frame length afterwards.
var tmp = skin.GetAnimation(imageName, true, false);
double frameLength = 0;
if (tmp is IAnimation tmpAnimation && tmpAnimation.FrameCount > 0)
frameLength = Math.Max(1000 / 60.0, 170.0 / tmpAnimation.FrameCount);
explosion = skin.GetAnimation(imageName, true, false, startAtCurrentTime: true, frameLength: frameLength).With(d =>
{ {
if (d == null) if (d == null)
return; return;
@ -40,12 +47,6 @@ namespace osu.Game.Rulesets.Mania.Skinning
d.Origin = Anchor.Centre; d.Origin = Anchor.Centre;
d.Blending = BlendingParameters.Additive; d.Blending = BlendingParameters.Additive;
d.Scale = new Vector2(explosionScale); d.Scale = new Vector2(explosionScale);
if (!(d is TextureAnimation texAnimation))
return;
if (texAnimation.FrameCount > 0)
texAnimation.DefaultFrameLength = Math.Max(texAnimation.DefaultFrameLength, 170.0 / texAnimation.FrameCount);
}); });
if (explosion != null) if (explosion != null)