h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 08:52:55 +08:00
Code Issues Releases Wiki Activity

Code cleanup pass:

Browse Source 
Make bubble transform logic more sane.

Extract bubble `getPosition()` method.

Address poorly named variables.
This commit is contained in:
mk56-spn 2023-02-16 11:12:30 +01:00
parent d413b69f55
commit d5bc8e2941
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
osu.Game.Rulesets.Osu/Mods/OsuModBubbles.cs
View File

@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Mods
private readonly Bindable<int> currentCombo = new BindableInt(); private readonly Bindable<int> currentCombo = new BindableInt();
private float maxSize; private float maxSize;
private float bubbleRadius; private float bubbleSize;
private double bubbleFade; private double bubbleFade;
private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100); private readonly DrawablePool<BubbleDrawable> bubblePool = new DrawablePool<BubbleDrawable>(100);
@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
// Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen // Multiplying by 2 results in an initial size that is too large, hence 1.90 has been chosen
// Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size // Also avoids the HitObject bleeding around the edges of the bubble drawable at minimum size
bubbleRadius = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f); bubbleSize = (float)(drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().Radius * 1.90f);
bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2; bubbleFade = drawableRuleset.Beatmap.HitObjects.OfType<HitCircle>().First().TimePreempt * 2;
// We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering) // We want to hide the judgements since they are obscured by the BubbleDrawable (due to layering)
@ -96,7 +96,7 @@ namespace osu.Game.Rulesets.Osu.Mods
BubbleDrawable bubble = bubblePool.Get(); BubbleDrawable bubble = bubblePool.Get();
bubble.DrawableOsuHitObject = drawableOsuHitObject; bubble.DrawableOsuHitObject = drawableOsuHitObject;
bubble.InitialSize = new Vector2(bubbleRadius); bubble.InitialSize = new Vector2(bubbleSize);
bubble.FadeTime = bubbleFade; bubble.FadeTime = bubbleFade;
bubble.MaxSize = maxSize; bubble.MaxSize = maxSize;
@ -122,9 +122,11 @@ namespace osu.Game.Rulesets.Osu.Mods
public DrawableOsuHitObject? DrawableOsuHitObject { get; set; } public DrawableOsuHitObject? DrawableOsuHitObject { get; set; }
public Vector2 InitialSize { get; set; } public Vector2 InitialSize { get; set; }
public double FadeTime { get; set; }
public float MaxSize { get; set; } public float MaxSize { get; set; }
public double FadeTime { get; set; }
private readonly Box colourBox; private readonly Box colourBox;
private readonly CircularContainer content; private readonly CircularContainer content;
@ -155,12 +157,9 @@ namespace osu.Game.Rulesets.Osu.Mods
Debug.Assert(DrawableOsuHitObject.IsNotNull()); Debug.Assert(DrawableOsuHitObject.IsNotNull());
Colour = DrawableOsuHitObject.IsHit ? Colour4.White : Colour4.Black; Colour = DrawableOsuHitObject.IsHit ? Colour4.White : Colour4.Black;
Alpha = 1;
Scale = new Vector2(1); Scale = new Vector2(1);
Position = getPosition(); Position = getPosition(DrawableOsuHitObject);
Size = InitialSize; Size = InitialSize;
content.BorderThickness = InitialSize.X / 3.5f;
content.BorderColour = Colour4.White;
//We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect. //We want to fade to a darker colour to avoid colours such as white hiding the "ripple" effect.
ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f); ColourInfo colourDarker = DrawableOsuHitObject.AccentColour.Value.Darken(0.1f);
@ -169,7 +168,8 @@ namespace osu.Game.Rulesets.Osu.Mods
double getAnimationDuration = 1700 + Math.Pow(FadeTime, 1.07f); double getAnimationDuration = 1700 + Math.Pow(FadeTime, 1.07f);
// Main bubble scaling based on combo // Main bubble scaling based on combo
this.ScaleTo(MaxSize, getAnimationDuration * 0.8f) this.FadeTo(1)
.ScaleTo(MaxSize, getAnimationDuration * 0.8f)
.Then() .Then()
// Pop at the end of the bubbles life time // Pop at the end of the bubbles life time
.ScaleTo(MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint) .ScaleTo(MaxSize * 1.5f, getAnimationDuration * 0.2f, Easing.OutQuint)
@ -177,6 +177,9 @@ namespace osu.Game.Rulesets.Osu.Mods
if (!DrawableOsuHitObject.IsHit) return; if (!DrawableOsuHitObject.IsHit) return;
content.BorderThickness = InitialSize.X / 3.5f;
content.BorderColour = Colour4.White;
colourBox.FadeColour(colourDarker); colourBox.FadeColour(colourDarker);
content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint); content.TransformTo(nameof(BorderColour), colourDarker, getAnimationDuration * 0.3f, Easing.OutQuint);
@ -184,23 +187,23 @@ namespace osu.Game.Rulesets.Osu.Mods
content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint) content.TransformTo(nameof(BorderThickness), 2f, getAnimationDuration * 0.3f, Easing.OutQuint)
// Avoids transparency overlap issues during the bubble "pop" // Avoids transparency overlap issues during the bubble "pop"
.Then().Schedule(() => content.BorderThickness = 0); .Then().Schedule(() => content.BorderThickness = 0);
}
Vector2 getPosition() private Vector2 getPosition(DrawableOsuHitObject drawableOsuHitObject)
{
switch (drawableOsuHitObject)
{ {
switch (DrawableOsuHitObject) // SliderHeads are derived from HitCircles,
{ // so we must handle them before to avoid them using the wrong positioning logic
// SliderHeads are derived from HitCircles, case DrawableSliderHead:
// so we must handle them before to avoid them using the wrong positioning logic return drawableOsuHitObject.HitObject.Position;
case DrawableSliderHead:
return DrawableOsuHitObject.HitObject.Position;
// Using hitobject position will cause issues with HitCircle placement due to stack leniency. // Using hitobject position will cause issues with HitCircle placement due to stack leniency.
case DrawableHitCircle: case DrawableHitCircle:
return DrawableOsuHitObject.Position; return drawableOsuHitObject.Position;
default: default:
return DrawableOsuHitObject.HitObject.Position; return drawableOsuHitObject.HitObject.Position;
}
} }
} }
} }