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

Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2

Browse Source
This commit is contained in:
Dean Herbert
2019-11-06 16:22:55 +09:00
parent a91ffdaad9 e4ad657353
commit 23eab68c72
83 changed files with 1606 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Edit/Timing/SampleSection.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Bindables;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays.Settings;
@ -31,6 +32,15 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void OnControlPointChanged(ValueChangedEvent<SampleControlPoint> point)
{
if (point.NewValue != null)
{
bank.Current = point.NewValue.SampleBankBindable;
volume.Bindable = point.NewValue.SampleVolumeBindable;
}
}
protected override SampleControlPoint CreatePoint()
{
var reference = Beatmap.Value.Beatmap.ControlPointInfo.SamplePointAt(SelectedGroup.Value.Time);
@ -41,19 +51,5 @@ namespace osu.Game.Screens.Edit.Timing
SampleVolume = reference.SampleVolume,
};
}
protected override void LoadComplete()
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
{
if (point.NewValue != null)
{
bank.Current = point.NewValue.SampleBankBindable;
volume.Bindable = point.NewValue.SampleVolumeBindable;
}
});
}
}
}