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

Simplify sample construction logic and move private functions down

Browse Source
This commit is contained in:
Dean Herbert 2021-06-09 19:06:37 +09:00
parent 489a5a3c1d
commit 499aba95c0
1 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
View File

@ -254,45 +254,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
{ {
tickPlaybackRate = new Bindable<double>(sfx_score_tick_debounce_rate_start); tickPlaybackRate = new Bindable<double>(sfx_score_tick_debounce_rate_start);
switch (score.Rank)
{
case ScoreRank.D:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-fail-d"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-d"));
break;
case ScoreRank.C:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-fail"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-c"));
break;
case ScoreRank.B:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-fail"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-b"));
break;
case ScoreRank.A:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-pass"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-a"));
break;
case ScoreRank.S:
case ScoreRank.SH:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-pass"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-s"));
break;
case ScoreRank.X:
case ScoreRank.XH:
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(@"Results/rank-impact-pass-ss"));
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", @"Results/applause-s"));
break;
}
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
rankImpactSound, rankImpactSound = new PoolableSkinnableSample(new SampleInfo(impactSampleName)),
rankApplauseSound, rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", applauseSampleName)),
scoreTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/score-tick")), scoreTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/score-tick")),
badgeTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink")), badgeTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink")),
badgeMaxSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink-max")), badgeMaxSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink-max")),
@ -301,12 +266,32 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
} }
} }
private ScoreRank getRank(ScoreRank rank) private string applauseSampleName
{ {
foreach (var mod in score.Mods.OfType<IApplicableToScoreProcessor>()) get
rank = mod.AdjustRank(rank, score.Accuracy); {
switch (score.Rank)
{
default:
case ScoreRank.D:
return @"Results/rank-applause-d";
return rank; case ScoreRank.C:
return @"Results/rank-applause-c";
case ScoreRank.B:
return @"Results/rank-applause-b";
case ScoreRank.A:
return @"Results/rank-applause-a";
case ScoreRank.S:
case ScoreRank.SH:
case ScoreRank.X:
case ScoreRank.XH:
return @"Results/rank-applause-s";
}
}
} }
protected override void Update() protected override void Update()
@ -409,6 +394,44 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
} }
} }
private string impactSampleName
{
get
{
switch (score.Rank)
{
default:
case ScoreRank.D:
return @"Results/rank-impact-fail-d";
case ScoreRank.C:
return @"Results/rank-impact-fail";
case ScoreRank.B:
return @"Results/rank-impact-fail";
case ScoreRank.A:
return @"Results/rank-impact-pass";
case ScoreRank.S:
case ScoreRank.SH:
return @"Results/rank-impact-pass";
case ScoreRank.X:
case ScoreRank.XH:
return @"Results/rank-impact-pass-ss";
}
}
}
private ScoreRank getRank(ScoreRank rank)
{
foreach (var mod in score.Mods.OfType<IApplicableToScoreProcessor>())
rank = mod.AdjustRank(rank, score.Accuracy);
return rank;
}
private double inverseEasing(Easing easing, double targetValue) private double inverseEasing(Easing easing, double targetValue)
{ {
double test = 0; double test = 0;