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

Maintain catch hit explosion by lifetime entries

Browse Source 
- Fix hit explosion not showing when a replay is rewound to a time after a hit object is caught
This commit is contained in:
ekrctb
2021-06-04 19:46:50 +09:00
parent 2069a5bd28
commit 181f1da3d3
5 changed files with 66 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game.Rulesets.Catch/UI/HitExplosion.cs
View File

@ -5,31 +5,15 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Pooling;
using osu.Framework.Utils;
using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Objects.Pooling;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Catch.UI
{
public class HitExplosion : PoolableDrawable
public class HitExplosion : PoolableDrawableWithLifetime<HitExplosionEntry>
{
private Color4 objectColour;
public CatchHitObject HitObject;
public Color4 ObjectColour
{
get => objectColour;
set
{
if (objectColour == value) return;
objectColour = value;
onColourChanged();
}
}
private readonly CircularContainer largeFaint;
private readonly CircularContainer smallFaint;
private readonly CircularContainer directionalGlow1;
@ -83,9 +67,19 @@ namespace osu.Game.Rulesets.Catch.UI
};
}
protected override void PrepareForUse()
protected override void OnApply(HitExplosionEntry entry)
{
base.PrepareForUse();
X = entry.Position;
Scale = new Vector2(entry.Scale);
setColour(entry.ObjectColour);
using (BeginAbsoluteSequence(entry.LifetimeStart))
applyTransforms();
}
private void applyTransforms()
{
ClearTransforms(true);
const double duration = 400;
@ -99,11 +93,10 @@ namespace osu.Game.Rulesets.Catch.UI
directionalGlow1.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
directionalGlow2.Rotation = RNG.NextSingle(-angle_variangle, angle_variangle);
this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
Expire(true);
this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out).Expire();
}
private void onColourChanged()
private void setColour(Color4 objectColour)
{
const float roundness = 100;