h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 06:17:23 +08:00
Code Issues Releases Wiki Activity

Rename ApproachRate to ScrollSpeed for now (to reduce complexity/confusion)

Browse Source
This commit is contained in:
Dean Herbert 2021-09-06 14:56:34 +09:00
parent 0500cd578a
commit 766d789845
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
View File

@ -93,9 +93,9 @@ namespace osu.Game.Tests.Visual.Gameplay
private IList<MultiplierControlPoint> testControlPoints => new List<MultiplierControlPoint>
{
new MultiplierControlPoint(time_range) { EffectPoint = { ApproachRate = 1.25 } },
new MultiplierControlPoint(1.5 * time_range) { EffectPoint = { ApproachRate = 1 } },
new MultiplierControlPoint(2 * time_range) { EffectPoint = { ApproachRate = 1.5 } }
new MultiplierControlPoint(time_range) { EffectPoint = { ScrollSpeed = 1.25 } },
new MultiplierControlPoint(1.5 * time_range) { EffectPoint = { ScrollSpeed = 1 } },
new MultiplierControlPoint(2 * time_range) { EffectPoint = { ScrollSpeed = 1.5 } }
};
[Test]

18
osu.Game/Beatmaps/ControlPoints/EffectControlPoint.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Beatmaps.ControlPoints
{
KiaiModeBindable = { Disabled = true },
OmitFirstBarLineBindable = { Disabled = true },
ApproachRateBindable = { Disabled = true }
ScrollSpeedBindable = { Disabled = true }
};
/// <summary>
@ -22,9 +22,9 @@ namespace osu.Game.Beatmaps.ControlPoints
public readonly BindableBool OmitFirstBarLineBindable = new BindableBool();
/// <summary>
/// The relative approach rate at this control point.
/// The relative scroll speed at this control point.
/// </summary>
public readonly BindableDouble ApproachRateBindable = new BindableDouble(1)
public readonly BindableDouble ScrollSpeedBindable = new BindableDouble(1)
{
Precision = 0.01,
Default = 1,
@ -33,12 +33,12 @@ namespace osu.Game.Beatmaps.ControlPoints
};
/// <summary>
/// The relative approach rate.
/// The relative scroll speed.
/// </summary>
public double ApproachRate
public double ScrollSpeed
{
get => ApproachRateBindable.Value;
set => ApproachRateBindable.Value = value;
get => ScrollSpeedBindable.Value;
set => ScrollSpeedBindable.Value = value;
}
public override Color4 GetRepresentingColour(OsuColour colours) => colours.Purple;
@ -71,13 +71,13 @@ namespace osu.Game.Beatmaps.ControlPoints
&& existing is EffectControlPoint existingEffect
&& KiaiMode == existingEffect.KiaiMode
&& OmitFirstBarLine == existingEffect.OmitFirstBarLine
&& ApproachRate == existingEffect.ApproachRate;
&& ScrollSpeed == existingEffect.ScrollSpeed;
public override void CopyFrom(ControlPoint other)
{
KiaiMode = ((EffectControlPoint)other).KiaiMode;
OmitFirstBarLine = ((EffectControlPoint)other).OmitFirstBarLine;
ApproachRate = ((EffectControlPoint)other).ApproachRate;
ScrollSpeed = ((EffectControlPoint)other).ScrollSpeed;
base.CopyFrom(other);
}

2
osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
View File

@ -387,7 +387,7 @@ namespace osu.Game.Beatmaps.Formats
{
KiaiMode = kiaiMode,
OmitFirstBarLine = omitFirstBarSignature,
ApproachRate = speedMultiplier,
ScrollSpeed = speedMultiplier,
}, timingChange);
addControlPoint(time, new LegacySampleControlPoint

2
osu.Game/Rulesets/Timing/MultiplierControlPoint.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Timing
/// <summary>
/// The aggregate multiplier which this <see cref="MultiplierControlPoint"/> provides.
/// </summary>
public double Multiplier => Velocity * EffectPoint.ApproachRate * BaseBeatLength / TimingPoint.BeatLength;
public double Multiplier => Velocity * EffectPoint.ScrollSpeed * BaseBeatLength / TimingPoint.BeatLength;
/// <summary>
/// The base beat length to scale the <see cref="TimingPoint"/> provided multiplier relative to.