RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Determine SampleInfo defaults in DrawableHitObject

This commit is contained in:
smoogipoo 2017-12-21 16:02:33 +09:00
parent 58859f2ffb
commit cb7e192aff
9 changed files with 73 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
View File

@ -12,6 +12,7 @@
using osu.Game.Rulesets.Objects.Types;
using OpenTK;
using osu.Framework.Lists;
using osu.Framework.Extensions.IEnumerableExtensions;
namespace osu.Game.Rulesets.Catch.Objects
{
@ -29,9 +30,14 @@ public class JuiceStream : CatchHitObject, IHasCurve
public double Velocity;
public double TickDistance;
private ControlPointInfo controlPointInfo;
private BeatmapDifficulty difficulty;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
this.controlPointInfo = controlPointInfo;
this.difficulty = difficulty;
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
@ -124,6 +130,8 @@ public IEnumerable<CatchHitObject> Ticks
});
}
ticks.ForEach(t => t.ApplyDefaults(controlPointInfo, difficulty));
return ticks;
}
}

14
osu.Game.Rulesets.Mania/Objects/HoldNote.cs
View File

@ -63,10 +63,16 @@ public override int Column
/// </summary>
private double tickSpacing = 50;
private ControlPointInfo controlPointInfo;
private BeatmapDifficulty difficulty;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
this.controlPointInfo = controlPointInfo;
this.difficulty = difficulty;
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
tickSpacing = timingPoint.BeatLength / difficulty.SliderTickRate;
@ -89,11 +95,15 @@ private List<HoldNoteTick> createTicks()
for (double t = StartTime + tickSpacing; t <= EndTime - tickSpacing; t += tickSpacing)
{
ret.Add(new HoldNoteTick
var tick = new HoldNoteTick
{
StartTime = t,
Column = Column
});
};
tick.ApplyDefaults(controlPointInfo, difficulty);
ret.Add(tick);
}
return ret;

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

@ -57,6 +57,7 @@ public DrawableSlider(Slider s) : base(s)
Scale = s.Scale,
ComboColour = s.ComboColour,
Samples = s.Samples,
SoundControlPoint = s.SoundControlPoint
})
};

19
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -10,6 +10,7 @@
using osu.Game.Audio;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.Extensions.IEnumerableExtensions;
namespace osu.Game.Rulesets.Osu.Objects
{
@ -74,10 +75,16 @@ public override int StackHeight
public double Velocity;
public double TickDistance;
private ControlPointInfo controlPointInfo;
private BeatmapDifficulty difficulty;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
this.controlPointInfo = controlPointInfo;
this.difficulty = difficulty;
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(StartTime);
@ -124,7 +131,7 @@ public IEnumerable<SliderTick> Ticks
var distanceProgress = d / length;
var timeProgress = reversed ? 1 - distanceProgress : distanceProgress;
yield return new SliderTick
var ret = new SliderTick
{
RepeatIndex = repeat,
StartTime = repeatStartTime + timeProgress * repeatDuration,
@ -139,6 +146,10 @@ public IEnumerable<SliderTick> Ticks
Volume = s.Volume
}))
};
ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret;
}
}
}
@ -158,7 +169,7 @@ public IEnumerable<RepeatPoint> RepeatPoints
var repeatStartTime = StartTime + repeat * repeatDuration;
var distanceProgress = d / length;
yield return new RepeatPoint
var ret = new RepeatPoint
{
RepeatIndex = repeat,
StartTime = repeatStartTime,
@ -167,6 +178,10 @@ public IEnumerable<RepeatPoint> RepeatPoints
Scale = Scale,
ComboColour = ComboColour,
};
ret.ApplyDefaults(controlPointInfo, difficulty);
yield return ret;
}
}
}

14
osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
View File

@ -55,9 +55,14 @@ public class DrumRoll : TaikoHitObject, IHasEndTime
/// </summary>
private double tickSpacing = 100;
private ControlPointInfo controlPointInfo;
private BeatmapDifficulty difficulty;
public override void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaults(controlPointInfo, difficulty);
this.controlPointInfo = controlPointInfo;
this.difficulty = difficulty;
TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(StartTime);
@ -77,7 +82,7 @@ private List<DrumRollTick> createTicks()
bool first = true;
for (double t = StartTime; t < EndTime + tickSpacing / 2; t += tickSpacing)
{
ret.Add(new DrumRollTick
var tick = new DrumRollTick
{
FirstTick = first,
TickSpacing = tickSpacing,
@ -89,12 +94,15 @@ private List<DrumRollTick> createTicks()
Name = @"slidertick",
Volume = s.Volume
}))
});
};
tick.ApplyDefaults(controlPointInfo, difficulty);
ret.Add(tick);
first = false;
}
return ret;
}
}
}
}

27
osu.Game/Audio/SampleInfo.cs
View File

@ -15,40 +15,19 @@ public class SampleInfo
public const string HIT_NORMAL = @"hitnormal";
public const string HIT_CLAP = @"hitclap";
/// <summary>
/// The <see cref="SoundControlPoint"/> that is used for <see cref="Bank"/> and <see cref="Volume"/>
/// if the values have not already been provided by the hitobject.
/// </summary>
[JsonIgnore]
public SoundControlPoint ControlPoint;
private string bank;
/// <summary>
/// The bank to load the sample from.
/// </summary>
public string Bank
{
get { return string.IsNullOrEmpty(bank) ? (ControlPoint?.SampleBank ?? "normal") : bank; }
set { bank = value; }
}
public bool ShouldSerializeBank() => Bank != ControlPoint.SampleBank;
public string Bank;
/// <summary>
/// The name of the sample to load.
/// </summary>
public string Name { get; set; }
public string Name;
private int volume;
/// <summary>
/// The sample volume.
/// </summary>
public int Volume
{
get { return volume == 0 ? (ControlPoint?.SampleVolume ?? 0) : volume; }
set { volume = value; }
}
public bool ShouldSerializeVolume() => Volume != ControlPoint.SampleVolume;
public int Volume;
}
}

6
osu.Game/Beatmaps/ControlPoints/SoundControlPoint.cs
View File

@ -5,14 +5,16 @@ namespace osu.Game.Beatmaps.ControlPoints
{
public class SoundControlPoint : ControlPoint
{
public const string DEFAULT_BANK = "normal";
/// <summary>
/// The default sample bank at this control point.
/// </summary>
public string SampleBank;
public string SampleBank = DEFAULT_BANK;
/// <summary>
/// The default sample volume at this control point.
/// </summary>
public int SampleVolume;
}
}
}

15
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -86,12 +86,23 @@ private void load(AudioManager audio)
{
foreach (SampleInfo sample in HitObject.Samples)
{
SampleChannel channel = audio.Sample.Get($@"Gameplay/{sample.Bank}-{sample.Name}");
if (HitObject.SoundControlPoint == null)
throw new ArgumentNullException(nameof(HitObject.SoundControlPoint), $"{nameof(HitObject)} must always have an attached {nameof(HitObject.SoundControlPoint)}.");
var bank = sample.Bank;
if (string.IsNullOrEmpty(bank))
bank = HitObject.SoundControlPoint.SampleBank;
int volume = sample.Volume;
if (volume == 0)
volume = HitObject.SoundControlPoint.SampleVolume;
SampleChannel channel = audio.Sample.Get($@"Gameplay/{bank}-{sample.Name}");
if (channel == null)
continue;
channel.Volume.Value = sample.Volume;
channel.Volume.Value = volume;
Samples.Add(channel);
}
}

11
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -31,6 +31,9 @@ public class HitObject
/// </summary>
public SampleInfoList Samples = new SampleInfoList();
[JsonIgnore]
public SoundControlPoint SoundControlPoint;
/// <summary>
/// Whether this <see cref="HitObject"/> is in Kiai time.
/// </summary>
@ -48,13 +51,7 @@ public virtual void ApplyDefaults(ControlPointInfo controlPointInfo, BeatmapDiff
EffectControlPoint effectPoint = controlPointInfo.EffectPointAt(StartTime);
Kiai = effectPoint.KiaiMode;
// Initialize first sample
Samples.ForEach(s => s.ControlPoint = soundPoint);
// Initialize any repeat samples
var repeatData = this as IHasRepeats;
repeatData?.RepeatSamples?.ForEach(r => r.ForEach(s => s.ControlPoint = soundPoint));
SoundControlPoint = soundPoint;
}
}
}