sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Determine SampleInfo defaults in DrawableHitObject

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,12 +86,23 @@ namespace osu.Game.Rulesets.Objects.Drawables
{
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 @@ namespace osu.Game.Rulesets.Objects
/// </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 @@ namespace osu.Game.Rulesets.Objects
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;
}
}
}