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

Merge branch 'master' into shuffle-skin

Browse Source
This commit is contained in:
Dean Herbert
2020-11-11 11:34:48 +09:00
parent df5abd9651 451f0a29c6
commit a5e13e4d2c
2610 changed files with 130287 additions and 36554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -1,13 +1,15 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.MathUtils;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Logging;
using osu.Framework.Utils;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Skinning;
@ -21,63 +23,72 @@ namespace osu.Game.Overlays.Settings.Sections
public override string Header => "Skin";
public override IconUsage Icon => FontAwesome.Solid.PaintBrush;
public override Drawable CreateIcon() => new SpriteIcon
{
Icon = FontAwesome.Solid.PaintBrush
};
private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
private readonly Bindable<int> configBindable = new Bindable<int>();
private static readonly SkinInfo random_skin_info = new RandomSkinInfo();
private SkinManager skins;
private List<SkinInfo> usableSkins;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, SkinManager skins)
{
this.skins = skins;
[Resolved]
private SkinManager skins { get; set; }
private IBindable<WeakReference<SkinInfo>> managerUpdated;
private IBindable<WeakReference<SkinInfo>> managerRemoved;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
FlowContent.Spacing = new Vector2(0, 5);
Children = new Drawable[]
{
skinDropdown = new SkinSettingsDropdown(),
new SettingsSlider<double, SizeSlider>
new ExportSkinButton(),
new SettingsSlider<float, SizeSlider>
{
LabelText = "Menu cursor size",
Bindable = config.GetBindable<double>(OsuSetting.MenuCursorSize),
Current = config.GetBindable<float>(OsuSetting.MenuCursorSize),
KeyboardStep = 0.01f
},
new SettingsSlider<double, SizeSlider>
new SettingsSlider<float, SizeSlider>
{
LabelText = "Gameplay cursor size",
Bindable = config.GetBindable<double>(OsuSetting.GameplayCursorSize),
Current = config.GetBindable<float>(OsuSetting.GameplayCursorSize),
KeyboardStep = 0.01f
},
new SettingsCheckbox
{
LabelText = "Adjust gameplay cursor size based on current beatmap",
Bindable = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
Current = config.GetBindable<bool>(OsuSetting.AutoCursorSize)
},
new SettingsCheckbox
{
LabelText = "Beatmap skins",
Bindable = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins)
},
new SettingsCheckbox
{
LabelText = "Beatmap hitsounds",
Bindable = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds)
},
};
skins.ItemAdded += itemAdded;
skins.ItemRemoved += itemRemoved;
managerUpdated = skins.ItemUpdated.GetBoundCopy();
managerUpdated.BindValueChanged(itemUpdated);
managerRemoved = skins.ItemRemoved.GetBoundCopy();
managerRemoved.BindValueChanged(itemRemoved);
config.BindWith(OsuSetting.Skin, configBindable);
usableSkins = skins.GetAllUsableSkins();
skinDropdown.Bindable = dropdownBindable;
resetSkinButtons();
skinDropdown.Current = dropdownBindable;
updateItems();
// Todo: This should not be necessary when OsuConfigManager is databased
if (skinDropdown.Items.All(s => s.ID != configBindable.Value))
@ -86,10 +97,10 @@ namespace osu.Game.Overlays.Settings.Sections
configBindable.BindValueChanged(id => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == id.NewValue), true);
dropdownBindable.BindValueChanged(skin =>
{
if (v == random_skin_info)
if (skin.NewValue == random_skin_info)
randomizeSkin();
else
configBindable.Value = skin.NewValue.ID ?? 0;
configBindable.Value = skin.NewValue.ID;
});
}
@ -102,41 +113,29 @@ namespace osu.Game.Overlays.Settings.Sections
configBindable.Value = 0;
}
private void itemRemoved(SkinInfo s) => Schedule(() =>
private void updateItems()
{
usableSkins.RemoveAll(i => i.ID == s.ID);
resetSkinButtons();
});
usableSkins = skins.GetAllUsableSkins();
private void itemAdded(SkinInfo s)
{
if (existing)
return;
if (usableSkins.Count > 1)
usableSkins.Add(random_skin_info);
Schedule(() =>
{
usableSkins.Add(s);
resetSkinButtons();
});
skinDropdown.Items = usableSkins;
}
private void resetSkinButtons()
private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
{
skinDropdown.Items = usableSkins.Count > 1 ? usableSkins.Concat(new[] { random_skin_info }) : usableSkins;
if (weakItem.NewValue.TryGetTarget(out var item))
Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToArray());
}
protected override void Dispose(bool isDisposing)
private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
{
base.Dispose(isDisposing);
if (skins != null)
{
skins.ItemAdded -= itemAdded;
skins.ItemRemoved -= itemRemoved;
}
if (weakItem.NewValue.TryGetTarget(out var item))
Schedule(() => skinDropdown.Items = skinDropdown.Items.Where(i => i.ID != item.ID).ToArray());
}
private class SizeSlider : OsuSliderBar<double>
private class SizeSlider : OsuSliderBar<float>
{
public override string TooltipText => Current.Value.ToString(@"0.##x");
}
@ -161,5 +160,35 @@ namespace osu.Game.Overlays.Settings.Sections
public override string ToString() => Name;
}
private class ExportSkinButton : SettingsButton
{
[Resolved]
private SkinManager skins { get; set; }
private Bindable<Skin> currentSkin;
[BackgroundDependencyLoader]
private void load()
{
Text = "Export selected skin";
Action = export;
currentSkin = skins.CurrentSkin.GetBoundCopy();
currentSkin.BindValueChanged(skin => Enabled.Value = skin.NewValue.SkinInfo.ID > 0, true);
}
private void export()
{
try
{
skins.Export(currentSkin.Value.SkinInfo);
}
catch (Exception e)
{
Logger.Log($"Could not export current skin: {e.Message}", level: LogLevel.Error);
}
}
}
}
}