sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +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

14
osu.Game/Screens/Edit/Timing/DifficultySection.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.Overlays.Settings;
@ -26,17 +27,12 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void LoadComplete()
protected override void OnControlPointChanged(ValueChangedEvent<DifficultyControlPoint> point)
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
if (point.NewValue != null)
{
if (point.NewValue != null)
{
multiplier.Bindable = point.NewValue.SpeedMultiplierBindable;
}
}, true);
multiplier.Bindable = point.NewValue.SpeedMultiplierBindable;
}
}
protected override DifficultyControlPoint CreatePoint()

16
osu.Game/Screens/Edit/Timing/EffectSection.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics.UserInterfaceV2;
@ -22,18 +23,13 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void LoadComplete()
protected override void OnControlPointChanged(ValueChangedEvent<EffectControlPoint> point)
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
if (point.NewValue != null)
{
if (point.NewValue != null)
{
kiai.Current = point.NewValue.KiaiModeBindable;
omitBarLine.Current = point.NewValue.OmitFirstBarLineBindable;
}
});
kiai.Current = point.NewValue.KiaiModeBindable;
omitBarLine.Current = point.NewValue.OmitFirstBarLineBindable;
}
}
protected override EffectControlPoint CreatePoint()

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;
}
});
}
}
}

4
osu.Game/Screens/Edit/Timing/Section.cs
View File

@ -119,8 +119,12 @@ namespace osu.Game.Screens.Edit.Timing
ControlPoint.Value = points.NewValue?.ControlPoints.OfType<T>().FirstOrDefault();
checkbox.Current.Value = ControlPoint.Value != null;
}, true);
ControlPoint.BindValueChanged(OnControlPointChanged, true);
}
protected abstract void OnControlPointChanged(ValueChangedEvent<T> point);
protected abstract T CreatePoint();
}
}

8
osu.Game/Screens/Edit/Timing/TimingScreen.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.Timing
public class TimingScreen : EditorScreenWithTimeline
{
[Cached]
private Bindable<ControlPointGroup> selectedPoints = new Bindable<ControlPointGroup>();
private Bindable<ControlPointGroup> selectedGroup = new Bindable<ControlPointGroup>();
[Resolved]
private IAdjustableClock clock { get; set; }
@ -47,7 +47,11 @@ namespace osu.Game.Screens.Edit.Timing
{
base.LoadComplete();
selectedPoints.BindValueChanged(selected => { clock.Seek(selected.NewValue.Time); });
selectedGroup.BindValueChanged(selected =>
{
if (selected.NewValue != null)
clock.Seek(selected.NewValue.Time);
});
}
public class ControlPointList : CompositeDrawable

15
osu.Game/Screens/Edit/Timing/TimingSection.cs
View File

@ -32,18 +32,13 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void LoadComplete()
protected override void OnControlPointChanged(ValueChangedEvent<TimingControlPoint> point)
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
if (point.NewValue != null)
{
if (point.NewValue != null)
{
bpm.Bindable = point.NewValue.BeatLengthBindable;
timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
}
});
bpm.Bindable = point.NewValue.BeatLengthBindable;
timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
}
}
protected override TimingControlPoint CreatePoint()