h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 19:32:55 +08:00
Code Issues Releases Wiki Activity

Make slider/spinner use pooled samples

Browse Source
This commit is contained in:
smoogipoo 2020-11-19 20:40:30 +09:00
parent f013928fa3
commit 688a04c2ff
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Audio;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Osu.Skinning; using osu.Game.Rulesets.Osu.Skinning;
using osu.Game.Rulesets.Osu.UI; using osu.Game.Rulesets.Osu.UI;
@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private Container<DrawableSliderTail> tailContainer; private Container<DrawableSliderTail> tailContainer;
private Container<DrawableSliderTick> tickContainer; private Container<DrawableSliderTick> tickContainer;
private Container<DrawableSliderRepeat> repeatContainer; private Container<DrawableSliderRepeat> repeatContainer;
private Container<PausableSkinnableSound> samplesContainer; private PausableSkinnableSound slidingSample;
public DrawableSlider() public DrawableSlider()
: this(null) : this(null)
@ -69,7 +70,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Alpha = 0 Alpha = 0
}, },
headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both }, headContainer = new Container<DrawableSliderHead> { RelativeSizeAxes = Axes.Both },
samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both } slidingSample = new PausableSkinnableSound { Looping = true }
}; };
PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition); PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
@ -100,17 +101,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.OnFree(hitObject); base.OnFree(hitObject);
PathVersion.UnbindFrom(HitObject.Path.Version); PathVersion.UnbindFrom(HitObject.Path.Version);
}
private PausableSkinnableSound slidingSample; slidingSample.Samples = null;
}
protected override void LoadSamples() protected override void LoadSamples()
{ {
base.LoadSamples(); base.LoadSamples();
samplesContainer.Clear();
slidingSample = null;
var firstSample = HitObject.Samples.FirstOrDefault(); var firstSample = HitObject.Samples.FirstOrDefault();
if (firstSample != null) if (firstSample != null)
@ -118,10 +116,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
var clone = HitObject.SampleControlPoint.ApplyTo(firstSample); var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
clone.Name = "sliderslide"; clone.Name = "sliderslide";
samplesContainer.Add(slidingSample = new PausableSkinnableSound(clone) slidingSample.Samples = new ISampleInfo[] { clone };
{
Looping = true
});
} }
} }

29
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Audio;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Audio;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
private Container<DrawableSpinnerTick> ticks; private Container<DrawableSpinnerTick> ticks;
private SpinnerBonusDisplay bonusDisplay; private SpinnerBonusDisplay bonusDisplay;
private Container<PausableSkinnableSound> samplesContainer; private PausableSkinnableSound spinningSample;
private Bindable<bool> isSpinning; private Bindable<bool> isSpinning;
private bool spinnerFrequencyModulate; private bool spinnerFrequencyModulate;
@ -81,7 +82,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = -120, Y = -120,
}, },
samplesContainer = new Container<PausableSkinnableSound> { RelativeSizeAxes = Axes.Both } spinningSample = new PausableSkinnableSound
{
Volume = { Value = 0 },
Looping = true,
Frequency = { Value = spinning_sample_initial_frequency }
}
}; };
PositionBindable.BindValueChanged(pos => Position = pos.NewValue); PositionBindable.BindValueChanged(pos => Position = pos.NewValue);
@ -95,17 +101,20 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
isSpinning.BindValueChanged(updateSpinningSample); isSpinning.BindValueChanged(updateSpinningSample);
} }
private PausableSkinnableSound spinningSample;
private const float spinning_sample_initial_frequency = 1.0f; private const float spinning_sample_initial_frequency = 1.0f;
private const float spinning_sample_modulated_base_frequency = 0.5f; private const float spinning_sample_modulated_base_frequency = 0.5f;
protected override void OnFree(HitObject hitObject)
{
base.OnFree(hitObject);
spinningSample.Samples = null;
}
protected override void LoadSamples() protected override void LoadSamples()
{ {
base.LoadSamples(); base.LoadSamples();
samplesContainer.Clear();
spinningSample = null;
var firstSample = HitObject.Samples.FirstOrDefault(); var firstSample = HitObject.Samples.FirstOrDefault();
if (firstSample != null) if (firstSample != null)
@ -113,12 +122,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
var clone = HitObject.SampleControlPoint.ApplyTo(firstSample); var clone = HitObject.SampleControlPoint.ApplyTo(firstSample);
clone.Name = "spinnerspin"; clone.Name = "spinnerspin";
samplesContainer.Add(spinningSample = new PausableSkinnableSound(clone) spinningSample.Samples = new ISampleInfo[] { clone };
{ spinningSample.Frequency.Value = spinning_sample_initial_frequency;
Volume = { Value = 0 },
Looping = true,
Frequency = { Value = spinning_sample_initial_frequency }
});
} }
} }