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

update tests, change binding and reduce lines in cinema mod

Browse Source
This commit is contained in:
Albie
2019-12-11 17:39:40 +00:00
parent 83b2e0525e
commit caa9286a90
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tests/Visual/Background/TestSceneUserDimContainer.cs
View File

@ -155,9 +155,18 @@ namespace osu.Game.Tests.Visual.Background
public void DisableUserDisplaySettingsTest() public void DisableUserDisplaySettingsTest()
{ {
performFullSetup(); performFullSetup();
AddStep("Start ignoring user settings", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true); createFakeStoryboard();
AddStep("Enable Storyboard", () =>
{
player.ReplacesBackground.Value = true;
player.StoryboardEnabled.Value = true;
});
AddStep("Enable user dim", () => player.DimmableStoryboard.EnableUserDim.Value = true);
AddStep("Set dim level to 1", () => songSelect.DimLevel.Value = 1f);
waitForDim(); waitForDim();
AddAssert("Check the background is undimmed", () => player.IsBackgroundUndimmed()); AddAssert("Ignore User Settings", () => player.DimmableStoryboard.IgnoreUserSettings.Value = true);
waitForDim();
AddAssert("User dim settings ignored", () => !player.DimmableStoryboard.EnableUserDim.Value && player.DimmableStoryboard.DimLevel == 0);
} }
/// <summary> /// <summary>
@ -365,8 +374,6 @@ namespace osu.Game.Tests.Visual.Background
public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard; public new DimmableStoryboard DimmableStoryboard => base.DimmableStoryboard;
public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1);
// Whether or not the player should be allowed to load. // Whether or not the player should be allowed to load.
public bool BlockLoad; public bool BlockLoad;

14
osu.Game/Graphics/Containers/UserDimContainer.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Graphics.Containers
/// </summary> /// </summary>
public bool ContentDisplayed { get; private set; } public bool ContentDisplayed { get; private set; }
public double DimLevel => EnableUserDim.Value && !IgnoreUserSettings.Value ? UserDimLevel.Value : 0; public double DimLevel => EnableUserDim.Value ? UserDimLevel.Value : 0;
protected Bindable<double> UserDimLevel { get; private set; } protected Bindable<double> UserDimLevel { get; private set; }
@ -69,7 +69,7 @@ namespace osu.Game.Graphics.Containers
ShowStoryboard.ValueChanged += _ => UpdateVisuals(); ShowStoryboard.ValueChanged += _ => UpdateVisuals();
ShowVideo.ValueChanged += _ => UpdateVisuals(); ShowVideo.ValueChanged += _ => UpdateVisuals();
StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals(); StoryboardReplacesBackground.ValueChanged += _ => UpdateVisuals();
IgnoreUserSettings.ValueChanged += _ => UpdateVisuals(); IgnoreUserSettings.ValueChanged += _ => updateSettings();
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -91,7 +91,15 @@ namespace osu.Game.Graphics.Containers
ContentDisplayed = ShowDimContent; ContentDisplayed = ShowDimContent;
dimContent.FadeTo(ContentDisplayed ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint); dimContent.FadeTo(ContentDisplayed ? 1 : 0, BACKGROUND_FADE_DURATION, Easing.OutQuint);
dimContent.FadeColour(IgnoreUserSettings.Value ? Color4.White : OsuColour.Gray(1 - (float)DimLevel), BACKGROUND_FADE_DURATION, Easing.OutQuint); dimContent.FadeColour(OsuColour.Gray(1 - (float)DimLevel), BACKGROUND_FADE_DURATION, Easing.OutQuint);
}
/// <summary>
/// Invoked when the IgnoreUserSettings bindable is changed
/// </summary>
private void updateSettings()
{
EnableUserDim.Value = !IgnoreUserSettings.Value;
} }
} }
} }

2
osu.Game/Rulesets/Mods/ModCinema.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Rulesets.Mods
public void ApplyToPlayer(Player player) public void ApplyToPlayer(Player player)
{ {
player.Background.EnableUserDim.Value = false; player.Background.EnableUserDim.Value = false;
player.DimmableVideo.EnableUserDim.Value = false;
player.DimmableStoryboard.EnableUserDim.Value = false;
player.DimmableVideo.IgnoreUserSettings.Value = true; player.DimmableVideo.IgnoreUserSettings.Value = true;
player.DimmableStoryboard.IgnoreUserSettings.Value = true; player.DimmableStoryboard.IgnoreUserSettings.Value = true;