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

Removed public ParallaxEnabled property

Browse Source
This commit is contained in:
Jorolf
2017-02-19 13:47:26 +01:00
parent f166bb0f96
commit e83ac8b04c
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -17,22 +17,6 @@ namespace osu.Game.Graphics.Containers
public float ParallaxAmount = 0.02f; public float ParallaxAmount = 0.02f;
private bool parallaxEnabled = true; private bool parallaxEnabled = true;
public bool ParallaxEnabled
{
get
{
return parallaxEnabled;
}
set
{
parallaxEnabled = value;
if (!parallaxEnabled)
{
content.MoveTo(Vector2.Zero, 1000, EasingTypes.OutQuint);
content.Scale = Vector2.One;
}
}
}
public override bool Contains(Vector2 screenSpacePos) => true; public override bool Contains(Vector2 screenSpacePos) => true;
@ -59,7 +43,12 @@ namespace osu.Game.Graphics.Containers
config.GetBindable<bool>(OsuConfig.MenuParallax).ValueChanged += delegate config.GetBindable<bool>(OsuConfig.MenuParallax).ValueChanged += delegate
{ {
ParallaxEnabled = config.GetBindable<bool>(OsuConfig.MenuParallax); parallaxEnabled = config.GetBindable<bool>(OsuConfig.MenuParallax);
if (!parallaxEnabled)
{
content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
content.Scale = Vector2.One;
}
}; };
} }
@ -69,7 +58,7 @@ namespace osu.Game.Graphics.Containers
{ {
base.Update(); base.Update();
if (ParallaxEnabled) { if (parallaxEnabled) {
Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2; Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2;
content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint); content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
content.Scale = new Vector2(1 + ParallaxAmount); content.Scale = new Vector2(1 + ParallaxAmount);