h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 20:07:25 +08:00
Code Issues Releases Wiki Activity

Improved readability and sounds

Browse Source
This commit is contained in:
Terochi 2023-04-25 21:05:40 +02:00
parent 8e8dda3ac0
commit 0841e73a39
3 changed files with 69 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game.Tests/Mods/ModSettingsTest.cs
View File

@ -43,18 +43,18 @@ namespace osu.Game.Tests.Mods
var modDouble = new TestNonMatchingSettingTypeModDouble { TestSetting = { Value = setting_change } };
var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change } };
var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } };
modDouble.CopySharedSettings(modBool);
modDouble.CopySharedSettings(modInt);
modBool.CopySharedSettings(modDouble);
modBool.CopySharedSettings(modInt);
modInt.CopySharedSettings(modDouble);
modInt.CopySharedSettings(modBool);
modDouble.CopyCommonSettings(modBool);
modDouble.CopyCommonSettings(modInt);
modBool.CopyCommonSettings(modDouble);
modBool.CopyCommonSettings(modInt);
modInt.CopyCommonSettings(modDouble);
modInt.CopyCommonSettings(modBool);
Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change));
Assert.That(modInt.TestSetting.Value, Is.EqualTo((int)setting_change / 2));
}
[Test]
@ -63,23 +63,12 @@ namespace osu.Game.Tests.Mods
var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
modBoolFalse.CopySharedSettings(modBoolTrue);
modBoolFalse.CopyCommonSettings(modBoolTrue);
Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));
}
[Test]
public void TestValueResetsToDefaultWhenCopied()
{
var modDouble = new TestNonMatchingSettingTypeModDouble();
var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
modBool.CopySharedSettings(modDouble);
Assert.That(modBool.TestSetting.Value, Is.EqualTo(modBool.TestSetting.Default));
}
private class TestNonMatchingSettingTypeModDouble : TestNonMatchingSettingTypeMod
{
public override string Acronym => "NMD";

35
osu.Game/OsuGameBase.cs
View File

@ -58,7 +58,6 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Scoring;
using osu.Game.Skinning;
using osu.Game.Utils;
using File = System.IO.File;
using RuntimeInfo = osu.Framework.RuntimeInfo;
namespace osu.Game
@ -71,7 +70,7 @@ namespace osu.Game
[Cached(typeof(OsuGameBase))]
public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncProvider
{
public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv" };
public static readonly string[] VIDEO_EXTENSIONS = { ".mp4", ".mov", ".avi", ".flv", ".mpg", ".wmv", ".m4v" };
public const string OSU_PROTOCOL = "osu://";
@ -626,20 +625,30 @@ namespace osu.Game
return;
}
var previouslySelectedCommonMods = new List<Mod>(SelectedMods.Value.Count);
var convertedCommonMods = new List<Mod>(SelectedMods.Value.Count);
foreach (var mod in SelectedMods.Value)
{
var convertedMod = instance.CreateModFromAcronym(mod.Acronym);
if (convertedMod == null)
continue;
previouslySelectedCommonMods.Add(mod);
convertedMod.CopyCommonSettings(mod);
convertedCommonMods.Add(convertedMod);
}
if (!SelectedMods.Disabled)
// Select common mods to play the deselect samples for other mods
SelectedMods.Value = previouslySelectedCommonMods;
AvailableMods.Value = dict;
if (!SelectedMods.Disabled)
{
//converting mods from one ruleset to the other, while also keeping their shared settings unchanged
SelectedMods.Value = SelectedMods.Value.Select(oldMod =>
{
Mod newMod = instance.CreateModFromAcronym(oldMod.Acronym);
newMod?.CopySharedSettings(oldMod);
return newMod;
}).Where(m => m != null).ToArray();
}
SelectedMods.Value = convertedCommonMods;
void revertRulesetChange() => Ruleset.Value = r.OldValue?.Available == true ? r.OldValue : RulesetStore.AvailableRulesets.First();
}

85
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -115,21 +115,25 @@ namespace osu.Game.Rulesets.Mods
[JsonIgnore]
public virtual Type[] IncompatibleMods => Array.Empty<Type>();
private IReadOnlyList<IBindable>? settingsBacking;
private IReadOnlyDictionary<string, IBindable>? settingsBacking;
/// <summary>
/// A list of the all <see cref="IBindable"/> settings within this mod.
/// All <see cref="IBindable"/> settings within this mod.
/// </summary>
internal IReadOnlyList<IBindable> Settings =>
internal IEnumerable<IBindable> SettingsBindables => Settings.Values;
/// <summary>
/// Provides mapping of names to <see cref="IBindable"/>s of all settings within this mod.
/// </summary>
internal IReadOnlyDictionary<string, IBindable> Settings =>
settingsBacking ??= this.GetSettingsSourceProperties()
.Select(p => p.Item2.GetValue(this))
.Cast<IBindable>()
.ToList();
.Select(p => p.Item2)
.ToDictionary(property => property.Name.ToSnakeCase(), property => (IBindable)property.GetValue(this)!);
/// <summary>
/// Whether all settings in this mod are set to their default state.
/// </summary>
protected virtual bool UsesDefaultConfiguration => Settings.All(s => s.IsDefault);
protected virtual bool UsesDefaultConfiguration => SettingsBindables.All(s => s.IsDefault);
/// <summary>
/// Creates a copy of this <see cref="Mod"/> initialised to a default state.
@ -160,60 +164,37 @@ namespace osu.Game.Rulesets.Mods
}
/// <summary>
/// Copies all mod setting values sharing same <see cref="MemberInfo.Name"/> from <paramref name="source"/> into this instance.
/// When converting mods from one ruleset to the other, this method makes sure
/// to also copy the values of all settings sharing same <see cref="MemberInfo.Name"/> between the two instances.
/// </summary>
/// <param name="source">The mod to copy properties from.</param>
internal void CopySharedSettings(Mod source)
/// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks>
/// <param name="source">The mod to extract settings from.</param>
public void CopyCommonSettings(Mod source)
{
const string value = nameof(Bindable<int>.Value);
if (source.UsesDefaultConfiguration)
return;
Dictionary<string, object> sourceSettings = new Dictionary<string, object>();
foreach (var (_, sourceProperty) in source.GetSettingsSourceProperties())
foreach (var (name, targetSetting) in Settings)
{
sourceSettings.Add(sourceProperty.Name.ToSnakeCase(), sourceProperty.GetValue(source)!);
}
foreach (var (_, targetProperty) in this.GetSettingsSourceProperties())
{
object targetSetting = targetProperty.GetValue(this)!;
if (!sourceSettings.TryGetValue(targetProperty.Name.ToSnakeCase(), out object? sourceSetting))
if (!source.Settings.TryGetValue(name, out IBindable? sourceSetting))
continue;
if (((IBindable)sourceSetting).IsDefault)
{
// reset to default value if the source is default
targetSetting.GetType().GetMethod(nameof(Bindable<int>.SetDefault))!.Invoke(targetSetting, null);
continue;
}
bool hasSameGenericArgument = getGenericBaseType(targetSetting, typeof(Bindable<>))!.GenericTypeArguments.Single() ==
getGenericBaseType(sourceSetting, typeof(Bindable<>))!.GenericTypeArguments.Single();
if (!hasSameGenericArgument)
if (sourceSetting.IsDefault)
continue;
Type? targetBindableNumberType = getGenericBaseType(targetSetting, typeof(BindableNumber<>));
Type? sourceBindableNumberType = getGenericBaseType(sourceSetting, typeof(BindableNumber<>));
if (targetBindableNumberType == null || sourceBindableNumberType == null)
{
setValue(targetSetting, value, getValue(sourceSetting, value));
if (getBindableGenericType(targetSetting) != getBindableGenericType(sourceSetting))
continue;
// TODO: special case for handling number types
PropertyInfo property = targetSetting.GetType().GetProperty(nameof(Bindable<bool>.Value))!;
property.SetValue(targetSetting, property.GetValue(sourceSetting));
}
setValue(targetSetting, value, Convert.ChangeType(getValue(sourceSetting, value), targetBindableNumberType.GenericTypeArguments.Single()));
}
object? getValue(object setting, string name) =>
setting.GetType().GetProperty(name)!.GetValue(setting);
void setValue(object setting, string name, object? newValue) =>
setting.GetType().GetProperty(name)!.SetValue(setting, newValue);
Type? getGenericBaseType(object setting, Type genericType) =>
setting.GetType().GetTypeInheritance().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == genericType);
Type getBindableGenericType(IBindable setting) =>
setting.GetType().GetTypeInheritance()
.First(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Bindable<>))
.GenericTypeArguments.Single();
}
/// <summary>
@ -250,7 +231,7 @@ namespace osu.Game.Rulesets.Mods
if (ReferenceEquals(this, other)) return true;
return GetType() == other.GetType() &&
Settings.SequenceEqual(other.Settings, ModSettingsEqualityComparer.Default);
SettingsBindables.SequenceEqual(other.SettingsBindables, ModSettingsEqualityComparer.Default);
}
public override int GetHashCode()
@ -259,7 +240,7 @@ namespace osu.Game.Rulesets.Mods
hashCode.Add(GetType());
foreach (var setting in Settings)
foreach (var setting in SettingsBindables)
hashCode.Add(setting.GetUnderlyingSettingValue());
return hashCode.ToHashCode();