RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename config variables and setting strings

This commit is contained in:
Dean Herbert 2024-09-05 15:15:15 +09:00
parent 7983a765ab
commit 47a9b345eb
No known key found for this signature in database
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game.Rulesets.Osu.Tests/TestSceneOsuAnalysisContainer.cs
View File

@ -40,9 +40,9 @@ public void SetUpSteps()
settings = new ReplayAnalysisSettings(config),
};
settings.HitMarkersEnabled.Value = false;
settings.AimMarkersEnabled.Value = false;
settings.AimLinesEnabled.Value = false;
settings.ShowClickMarkers.Value = false;
settings.ShowAimMarkers.Value = false;
settings.ShowCursorPath.Value = false;
});
}
@ -51,36 +51,36 @@ public void TestEverythingOn()
{
AddStep("enable everything", () =>
{
settings.HitMarkersEnabled.Value = true;
settings.AimMarkersEnabled.Value = true;
settings.AimLinesEnabled.Value = true;
settings.ShowClickMarkers.Value = true;
settings.ShowAimMarkers.Value = true;
settings.ShowCursorPath.Value = true;
});
}
[Test]
public void TestHitMarkers()
{
AddStep("enable hit markers", () => settings.HitMarkersEnabled.Value = true);
AddStep("enable hit markers", () => settings.ShowClickMarkers.Value = true);
AddAssert("hit markers visible", () => analysisContainer.HitMarkersVisible);
AddStep("disable hit markers", () => settings.HitMarkersEnabled.Value = false);
AddStep("disable hit markers", () => settings.ShowClickMarkers.Value = false);
AddAssert("hit markers not visible", () => !analysisContainer.HitMarkersVisible);
}
[Test]
public void TestAimMarker()
{
AddStep("enable aim markers", () => settings.AimMarkersEnabled.Value = true);
AddStep("enable aim markers", () => settings.ShowAimMarkers.Value = true);
AddAssert("aim markers visible", () => analysisContainer.AimMarkersVisible);
AddStep("disable aim markers", () => settings.AimMarkersEnabled.Value = false);
AddStep("disable aim markers", () => settings.ShowAimMarkers.Value = false);
AddAssert("aim markers not visible", () => !analysisContainer.AimMarkersVisible);
}
[Test]
public void TestAimLines()
{
AddStep("enable aim lines", () => settings.AimLinesEnabled.Value = true);
AddStep("enable aim lines", () => settings.ShowCursorPath.Value = true);
AddAssert("aim lines visible", () => analysisContainer.AimLinesVisible);
AddStep("disable aim lines", () => settings.AimLinesEnabled.Value = false);
AddStep("disable aim lines", () => settings.ShowCursorPath.Value = false);
AddAssert("aim lines not visible", () => !analysisContainer.AimLinesVisible);
}

12
osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
View File

@ -23,9 +23,9 @@ protected override void InitialiseDefaults()
SetDefault(OsuRulesetSetting.ShowCursorRipples, false);
SetDefault(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
SetDefault(OsuRulesetSetting.ReplayHitMarkersEnabled, false);
SetDefault(OsuRulesetSetting.ReplayAimMarkersEnabled, false);
SetDefault(OsuRulesetSetting.ReplayAimLinesEnabled, false);
SetDefault(OsuRulesetSetting.ReplayClickMarkersEnabled, false);
SetDefault(OsuRulesetSetting.ReplayFrameMarkersEnabled, false);
SetDefault(OsuRulesetSetting.ReplayCursorPathEnabled, false);
SetDefault(OsuRulesetSetting.ReplayCursorHideEnabled, false);
}
}
@ -39,9 +39,9 @@ public enum OsuRulesetSetting
PlayfieldBorderStyle,
// Replay
ReplayHitMarkersEnabled,
ReplayAimMarkersEnabled,
ReplayAimLinesEnabled,
ReplayClickMarkersEnabled,
ReplayFrameMarkersEnabled,
ReplayCursorPathEnabled,
ReplayCursorHideEnabled,
}
}

18
osu.Game.Rulesets.Osu/UI/ReplayAnalysisOverlay.cs
View File

@ -14,9 +14,9 @@ namespace osu.Game.Rulesets.Osu.UI
{
public partial class ReplayAnalysisOverlay : CompositeDrawable
{
private BindableBool hitMarkersEnabled { get; } = new BindableBool();
private BindableBool aimMarkersEnabled { get; } = new BindableBool();
private BindableBool aimLinesEnabled { get; } = new BindableBool();
private BindableBool showClickMarkers { get; } = new BindableBool();
private BindableBool showFrameMarkers { get; } = new BindableBool();
private BindableBool showCursorPath { get; } = new BindableBool();
protected readonly ClickMarkerContainer ClickMarkers;
protected readonly FrameMarkerContainer FrameMarkers;
@ -43,18 +43,18 @@ private void load(OsuRulesetConfigManager config)
{
loadReplay();
config.BindWith(OsuRulesetSetting.ReplayHitMarkersEnabled, hitMarkersEnabled);
config.BindWith(OsuRulesetSetting.ReplayAimMarkersEnabled, aimMarkersEnabled);
config.BindWith(OsuRulesetSetting.ReplayAimLinesEnabled, aimLinesEnabled);
config.BindWith(OsuRulesetSetting.ReplayClickMarkersEnabled, showClickMarkers);
config.BindWith(OsuRulesetSetting.ReplayFrameMarkersEnabled, showFrameMarkers);
config.BindWith(OsuRulesetSetting.ReplayCursorPathEnabled, showCursorPath);
}
protected override void LoadComplete()
{
base.LoadComplete();
hitMarkersEnabled.BindValueChanged(enabled => ClickMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimMarkersEnabled.BindValueChanged(enabled => FrameMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
aimLinesEnabled.BindValueChanged(enabled => CursorPath.FadeTo(enabled.NewValue ? 1 : 0), true);
showClickMarkers.BindValueChanged(enabled => ClickMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
showFrameMarkers.BindValueChanged(enabled => FrameMarkers.FadeTo(enabled.NewValue ? 1 : 0), true);
showCursorPath.BindValueChanged(enabled => CursorPath.FadeTo(enabled.NewValue ? 1 : 0), true);
}
private void loadReplay()

24
osu.Game.Rulesets.Osu/UI/ReplayAnalysisSettings.cs
View File

@ -13,17 +13,17 @@ public partial class ReplayAnalysisSettings : PlayerSettingsGroup
{
private readonly OsuRulesetConfigManager config;
[SettingSource("Hit markers", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool HitMarkersEnabled { get; } = new BindableBool();
[SettingSource("Show click markers", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool ShowClickMarkers { get; } = new BindableBool();
[SettingSource("Aim markers", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool AimMarkersEnabled { get; } = new BindableBool();
[SettingSource("Show frame markers", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool ShowAimMarkers { get; } = new BindableBool();
[SettingSource("Aim lines", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool AimLinesEnabled { get; } = new BindableBool();
[SettingSource("Show cursor path", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool ShowCursorPath { get; } = new BindableBool();
[SettingSource("Hide cursor", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool CursorHideEnabled { get; } = new BindableBool();
[SettingSource("Hide gameplay cursor", SettingControlType = typeof(PlayerCheckbox))]
public BindableBool HideSkinCursor { get; } = new BindableBool();
public ReplayAnalysisSettings(OsuRulesetConfigManager config)
: base("Analysis Settings")
@ -36,10 +36,10 @@ private void load()
{
AddRange(this.CreateSettingsControls());
config.BindWith(OsuRulesetSetting.ReplayHitMarkersEnabled, HitMarkersEnabled);
config.BindWith(OsuRulesetSetting.ReplayAimMarkersEnabled, AimMarkersEnabled);
config.BindWith(OsuRulesetSetting.ReplayAimLinesEnabled, AimLinesEnabled);
config.BindWith(OsuRulesetSetting.ReplayCursorHideEnabled, CursorHideEnabled);
config.BindWith(OsuRulesetSetting.ReplayClickMarkersEnabled, ShowClickMarkers);
config.BindWith(OsuRulesetSetting.ReplayFrameMarkersEnabled, ShowAimMarkers);
config.BindWith(OsuRulesetSetting.ReplayCursorPathEnabled, ShowCursorPath);
config.BindWith(OsuRulesetSetting.ReplayCursorHideEnabled, HideSkinCursor);
}
}
}