RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-19 11:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Henry Lin 2021-06-14 21:34:34 +08:00
parent 12a17d0983
commit 04c0db6dce
3 changed files with 105 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs
View File

@ -30,7 +30,7 @@ using osuTK;
namespace osu.Game.Rulesets.Osu.Mods namespace osu.Game.Rulesets.Osu.Mods
{ {
public class OsuModTarget : ModWithVisibilityAdjustment, IApplicableToDrawableRuleset<OsuHitObject>, public class OsuModTarget : ModWithVisibilityAdjustment, IApplicableToDrawableRuleset<OsuHitObject>,
IApplicableToHealthProcessor, IApplicableToDifficulty, IApplicableFailOverride, IHasSeed IApplicableToHealthProcessor, IApplicableToDifficulty, IApplicableFailOverride, IHasSeed
{ {
public override string Name => "Target"; public override string Name => "Target";
public override string Acronym => "TP"; public override string Acronym => "TP";
@ -57,11 +57,11 @@ namespace osu.Game.Rulesets.Osu.Mods
// Sudden death // Sudden death
healthProcessor.FailConditions += (_, result) healthProcessor.FailConditions += (_, result)
=> result.Type.AffectsCombo() => result.Type.AffectsCombo()
&& !result.IsHit; && !result.IsHit;
} }
// Maximum distance to jump // Maximum distance to jump
public const float MAX_DISTANCE = 250f; private const float max_distance = 250f;
public override void ApplyToBeatmap(IBeatmap beatmap) public override void ApplyToBeatmap(IBeatmap beatmap)
{ {
@ -69,76 +69,68 @@ namespace osu.Game.Rulesets.Osu.Mods
var rng = new Random(Seed.Value.GetValueOrDefault()); var rng = new Random(Seed.Value.GetValueOrDefault());
float nextSingle(float max = 1f) float nextSingle(float max = 1f) => (float)(rng.NextDouble() * max);
{
return (float)(rng.NextDouble() * max);
}
var osuBeatmap = (OsuBeatmap)beatmap; var osuBeatmap = (OsuBeatmap)beatmap;
var origHitObjects = osuBeatmap.HitObjects.OrderBy(x => x.StartTime).ToList(); var origHitObjects = osuBeatmap.HitObjects.OrderBy(x => x.StartTime).ToList();
// Only place circles between startTime and endTime // Only place circles between startTime and endTime
var startTime = origHitObjects.First().StartTime; var startTime = origHitObjects.First().StartTime;
double endTime;
var endObj = origHitObjects.Last(); var endObj = origHitObjects.Last();
switch (endObj) var endTime = endObj switch
{ {
case Slider slider: Slider slider => slider.EndTime,
endTime = slider.EndTime; Spinner spinner => spinner.EndTime,
break; _ => endObj.StartTime
case Spinner spinner: };
endTime = spinner.EndTime;
break;
default:
endTime = endObj.StartTime;
break;
}
// Generate the beats // Generate the beats
var beats = osuBeatmap.ControlPointInfo.TimingPoints var beats = osuBeatmap.ControlPointInfo.TimingPoints
.Where(x => Precision.AlmostBigger(endTime, x.Time)) .Where(x => Precision.AlmostBigger(endTime, x.Time))
.SelectMany(tp => .SelectMany(tp =>
{ {
var tpBeats = new List<double>(); var tpBeats = new List<double>();
var currentTime = tp.Time; var currentTime = tp.Time;
while (Precision.AlmostBigger(endTime, currentTime) && osuBeatmap.ControlPointInfo.TimingPointAt(currentTime) == tp)
{ while (Precision.AlmostBigger(endTime, currentTime) && osuBeatmap.ControlPointInfo.TimingPointAt(currentTime) == tp)
tpBeats.Add(currentTime); {
currentTime += tp.BeatLength; tpBeats.Add(currentTime);
} currentTime += tp.BeatLength;
return tpBeats; }
})
// Remove beats that are before startTime return tpBeats;
.Where(x => Precision.AlmostBigger(x, startTime)) })
// Remove beats during breaks // Remove beats that are before startTime
.Where(x => !osuBeatmap.Breaks.Any(b => .Where(x => Precision.AlmostBigger(x, startTime))
Precision.AlmostBigger(x, b.StartTime) // Remove beats during breaks
&& Precision.AlmostBigger(origHitObjects.First(y => Precision.AlmostBigger(y.StartTime, b.EndTime)).StartTime, x) .Where(x => !osuBeatmap.Breaks.Any(b =>
)) Precision.AlmostBigger(x, b.StartTime)
.ToList(); && Precision.AlmostBigger(origHitObjects.First(y => Precision.AlmostBigger(y.StartTime, b.EndTime)).StartTime, x)
))
.ToList();
// Generate a hit circle for each beat // Generate a hit circle for each beat
var hitObjects = beats var hitObjects = beats
// Remove beats that are too close to the next one (e.g. due to timing point changes) // Remove beats that are too close to the next one (e.g. due to timing point changes)
.Where((x, idx) => .Where((x, idx) =>
{ {
if (idx == beats.Count - 1) return true; if (idx == beats.Count - 1) return true;
if (Precision.AlmostBigger(osuBeatmap.ControlPointInfo.TimingPointAt(x).BeatLength / 2, beats[idx + 1] - x))
return false; return !Precision.AlmostBigger(osuBeatmap.ControlPointInfo.TimingPointAt(x).BeatLength / 2, beats[idx + 1] - x);
return true; })
}) .Select(x =>
.Select(x => {
{ var newCircle = new HitCircle();
var newCircle = new HitCircle(); newCircle.ApplyDefaults(osuBeatmap.ControlPointInfo, osuBeatmap.BeatmapInfo.BaseDifficulty);
newCircle.ApplyDefaults(osuBeatmap.ControlPointInfo, osuBeatmap.BeatmapInfo.BaseDifficulty); newCircle.StartTime = x;
newCircle.StartTime = x; return (OsuHitObject)newCircle;
return (OsuHitObject)newCircle; }).ToList();
}).ToList();
// Add hit samples to the circles // Add hit samples to the circles
for (int i = 0; i < hitObjects.Count; i++) for (int i = 0; i < hitObjects.Count; i++)
{ {
var x = hitObjects[i]; var x = hitObjects[i];
var samples = getSamplesAtTime(origHitObjects, x.StartTime); var samples = getSamplesAtTime(origHitObjects, x.StartTime);
if (samples == null) if (samples == null)
{ {
if (i > 0) if (i > 0)
@ -155,11 +147,11 @@ namespace osu.Game.Rulesets.Osu.Mods
hitObjects.ForEach(x => hitObjects.ForEach(x =>
{ {
var origObj = origHitObjects.FindLast(y => Precision.AlmostBigger(x.StartTime, y.StartTime)); var origObj = origHitObjects.FindLast(y => Precision.AlmostBigger(x.StartTime, y.StartTime));
if (origObj == null) x.ComboIndex = 0; x.ComboIndex = origObj?.ComboIndex ?? 0;
else x.ComboIndex = origObj.ComboIndex;
}); });
// Then reprocess them to ensure continuity in the combo indices and add indices in current combo // Then reprocess them to ensure continuity in the combo indices and add indices in current combo
var combos = hitObjects.GroupBy(x => x.ComboIndex).ToList(); var combos = hitObjects.GroupBy(x => x.ComboIndex).ToList();
for (int i = 0; i < combos.Count; i++) for (int i = 0; i < combos.Count; i++)
{ {
var group = combos[i].ToList(); var group = combos[i].ToList();
@ -176,20 +168,22 @@ namespace osu.Game.Rulesets.Osu.Mods
// Position all hit circles // Position all hit circles
var direction = MathHelper.TwoPi * nextSingle(); var direction = MathHelper.TwoPi * nextSingle();
for (int i = 0; i < hitObjects.Count; i++) for (int i = 0; i < hitObjects.Count; i++)
{ {
var x = hitObjects[i]; var x = hitObjects[i];
if (i == 0) if (i == 0)
{ {
x.Position = new Vector2(nextSingle(OsuPlayfield.BASE_SIZE.X), nextSingle(OsuPlayfield.BASE_SIZE.Y)); x.Position = new Vector2(nextSingle(OsuPlayfield.BASE_SIZE.X), nextSingle(OsuPlayfield.BASE_SIZE.Y));
} }
else else
{ {
var distance = Math.Min(MAX_DISTANCE, 40f * (float)Math.Pow(1.05, x.ComboIndex)); var distance = Math.Min(max_distance, 40f * (float)Math.Pow(1.05, x.ComboIndex));
var relativePos = new Vector2( var relativePos = new Vector2(
distance * (float)Math.Cos(direction), distance * (float)Math.Cos(direction),
distance * (float)Math.Sin(direction) distance * (float)Math.Sin(direction)
); );
relativePos = getRotatedVector(hitObjects[i - 1].Position, relativePos); relativePos = getRotatedVector(hitObjects[i - 1].Position, relativePos);
direction = (float)Math.Atan2(relativePos.Y, relativePos.X); direction = (float)Math.Atan2(relativePos.Y, relativePos.X);
@ -209,7 +203,7 @@ namespace osu.Game.Rulesets.Osu.Mods
if (x.LastInCombo) if (x.LastInCombo)
direction = MathHelper.TwoPi * nextSingle(); direction = MathHelper.TwoPi * nextSingle();
else else
direction += distance / MAX_DISTANCE * (nextSingle() * MathHelper.TwoPi - MathHelper.Pi); direction += distance / max_distance * (nextSingle() * MathHelper.TwoPi - MathHelper.Pi);
} }
} }
@ -227,25 +221,24 @@ namespace osu.Game.Rulesets.Osu.Mods
/// <param name="hitObjects">The list of hit objects in a beatmap, ordered by StartTime</param> /// <param name="hitObjects">The list of hit objects in a beatmap, ordered by StartTime</param>
/// <param name="time">The point in time to get samples for</param> /// <param name="time">The point in time to get samples for</param>
/// <returns>Hit samples</returns> /// <returns>Hit samples</returns>
private IList<HitSampleInfo> getSamplesAtTime(List<OsuHitObject> hitObjects, double time) private IList<HitSampleInfo> getSamplesAtTime(IEnumerable<OsuHitObject> hitObjects, double time)
{ {
var sampleObj = hitObjects.FirstOrDefault(x => var sampleObj = hitObjects.FirstOrDefault(x =>
{ {
if (Precision.AlmostEquals(time, x.StartTime)) return true; if (Precision.AlmostEquals(time, x.StartTime)) return true;
if (x is Slider slider
&& Precision.AlmostBigger(time, slider.StartTime) if (!(x is Slider s))
&& Precision.AlmostBigger(slider.EndTime, time)) return false;
{ if (!Precision.AlmostBigger(time, s.StartTime)
if (Precision.AlmostEquals((time - slider.StartTime) % slider.SpanDuration, 0)) || !Precision.AlmostBigger(s.EndTime, time))
{ return false;
return true;
} return Precision.AlmostEquals((time - s.StartTime) % s.SpanDuration, 0);
}
return false;
}); });
if (sampleObj == null) return null; if (sampleObj == null) return null;
IList<HitSampleInfo> samples = null; IList<HitSampleInfo> samples;
if (sampleObj is Slider slider) if (sampleObj is Slider slider)
{ {
samples = slider.NodeSamples[(int)Math.Round((time - slider.StartTime) % slider.SpanDuration)]; samples = slider.NodeSamples[(int)Math.Round((time - slider.StartTime) % slider.SpanDuration)];
@ -254,6 +247,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
samples = sampleObj.Samples; samples = sampleObj.Samples;
} }
return samples; return samples;
} }
@ -269,19 +263,18 @@ namespace osu.Game.Rulesets.Osu.Mods
var h = (OsuHitObject)drawable.HitObject; var h = (OsuHitObject)drawable.HitObject;
// apply grow and fade effect // apply grow and fade effect
if (drawable is DrawableHitCircle circle) if (!(drawable is DrawableHitCircle circle)) return;
using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt))
{ {
using (drawable.BeginAbsoluteSequence(h.StartTime - h.TimePreempt)) // todo: this doesn't feel quite right yet
{ drawable.ScaleTo(0.4f)
// todo: this doesn't feel quite right yet
drawable.ScaleTo(0.4f)
.Then().ScaleTo(1.6f, h.TimePreempt * 2); .Then().ScaleTo(1.6f, h.TimePreempt * 2);
drawable.FadeTo(0.5f) drawable.FadeTo(0.5f)
.Then().Delay(h.TimeFadeIn).FadeTo(1f); .Then().Delay(h.TimeFadeIn).FadeTo(1f);
// remove approach circles // remove approach circles
circle.ApproachCircle.Hide(); circle.ApproachCircle.Hide();
}
} }
} }
@ -347,7 +340,7 @@ namespace osu.Game.Rulesets.Osu.Mods
} }
/// <summary> /// <summary>
/// Rotates vector "initial" towards vector "destinantion" /// Rotates vector "initial" towards vector "destination"
/// </summary> /// </summary>
/// <param name="initial">Vector to rotate to "destination"</param> /// <param name="initial">Vector to rotate to "destination"</param>
/// <param name="destination">Vector "initial" should be rotated to</param> /// <param name="destination">Vector "initial" should be rotated to</param>
@ -399,7 +392,7 @@ namespace osu.Game.Rulesets.Osu.Mods
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
sample = new PausableSkinnableSound(new SampleInfo("spinnerbonus")), // todo: use another sample? sample = new PausableSkinnableSound(new SampleInfo("spinnerbonus")) // todo: use another sample?
}; };
} }

54
osu.Game/Rulesets/Mods/IHasSeed.cs
View File

@ -5,7 +5,6 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings;
@ -18,11 +17,14 @@ namespace osu.Game.Rulesets.Mods
public class SeedSettingsControl : SettingsItem<int?> public class SeedSettingsControl : SettingsItem<int?>
{ {
protected override Drawable CreateControl() => new SeedControl protected override Drawable CreateControl()
{ {
RelativeSizeAxes = Axes.X, return new SeedControl
Margin = new MarginPadding { Top = 5 } {
}; RelativeSizeAxes = Axes.X,
Margin = new MarginPadding { Top = 5 }
};
}
private sealed class SeedControl : CompositeDrawable, IHasCurrentValue<int?> private sealed class SeedControl : CompositeDrawable, IHasCurrentValue<int?>
{ {
@ -46,33 +48,33 @@ namespace osu.Game.Rulesets.Mods
InternalChildren = new[] InternalChildren = new[]
{ {
new GridContainer new GridContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
ColumnDimensions = new[]
{ {
RelativeSizeAxes = Axes.X, new Dimension(),
AutoSizeAxes = Axes.Y, new Dimension(GridSizeMode.Absolute, 2),
ColumnDimensions = new[] new Dimension(GridSizeMode.Relative, 0.25f)
},
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize)
},
Content = new[]
{
new Drawable[]
{ {
new Dimension(), seedNumberBox = new OsuNumberBox
new Dimension(GridSizeMode.Absolute, 2),
new Dimension(GridSizeMode.Relative, 0.25f)
},
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize)
},
Content = new[]
{
new Drawable[]
{ {
seedNumberBox = new OsuNumberBox RelativeSizeAxes = Axes.X,
{ CommitOnFocusLost = true
RelativeSizeAxes = Axes.X,
CommitOnFocusLost = true
}
} }
} }
} }
}; }
};
seedNumberBox.Current.BindValueChanged(e => seedNumberBox.Current.BindValueChanged(e =>
{ {

5
osu.Game/Rulesets/Mods/ModRandom.cs
View File

@ -2,14 +2,9 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays.Settings;
namespace osu.Game.Rulesets.Mods namespace osu.Game.Rulesets.Mods
{ {