sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ability to contain multiple sample banks. Get default bank name from control point.

Browse Source
This commit is contained in:
smoogipooo
2017-04-05 21:59:07 +09:00
parent 8d720e39c6
commit d607207b69
11 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -59,8 +59,9 @@ namespace osu.Game.Modes.Objects.Drawables
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
foreach (var sample in HitObject.SampleBank.Sets)
samples.Add(audio.Sample.Get($@"Gameplay/{sample.Type}-hit{HitObject.SampleBank.Name}"));
foreach (var bank in HitObject.SampleBanks)
foreach (var sample in bank.Samples)
samples.Add(audio.Sample.Get($@"Gameplay/{sample.Type}-hit{bank.Name}"));
}
private ArmedState state;

21
osu.Game/Modes/Objects/HitObject.cs
View File

@ -4,6 +4,7 @@
using osu.Game.Beatmaps.Samples;
using osu.Game.Beatmaps.Timing;
using osu.Game.Database;
using System.Collections.Generic;
namespace osu.Game.Modes.Objects
{
@ -21,15 +22,29 @@ namespace osu.Game.Modes.Objects
public double StartTime { get; set; }
/// <summary>
/// The sample bank to be played when this hit object is hit.
/// The sample banks to be played when this hit object is hit.
/// </summary>
public SampleBank SampleBank { get; set; }
public List<SampleBank> SampleBanks = new List<SampleBank>();
/// <summary>
/// Applies default values to this HitObject.
/// </summary>
/// <param name="difficulty">The difficulty settings to use.</param>
/// <param name="timing">The timing settings to use.</param>
public virtual void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty) { }
public virtual void ApplyDefaults(TimingInfo timing, BeatmapDifficulty difficulty)
{
foreach (var bank in SampleBanks)
{
if (!string.IsNullOrEmpty(bank.Name))
continue;
// If the bank is not assigned a name, assign it from the relevant timing point
ControlPoint overridePoint;
ControlPoint timingPoint = timing.TimingPointAt(StartTime, out overridePoint);
bank.Name = (overridePoint ?? timingPoint)?.SampleBank.Name ?? string.Empty;
bank.Volume = (overridePoint ?? timingPoint)?.SampleBank.Volume ?? 0;
}
}
}
}