RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-15 11:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from peppy/fix-parallax-outside-bounds

Browse Source 
Parallax fixes.
This commit is contained in:
Thomas Müller 2016-11-24 09:23:50 +01:00 committed by GitHub
commit ae07806e43
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 1a521bb22cfd2c14f58d4cd60fbbfdb70ea8f87b
Subproject commit 71bbc980602829cf7eb0db537ebaa2f9668acda5

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

@ -25,18 +25,20 @@ namespace osu.Game.Graphics.Containers
}
private Container content;
private InputManager input;
protected override Container<Drawable> Content => content;
protected override bool OnMouseMove(InputState state)
[BackgroundDependencyLoader]
private void load(UserInputManager input)
{
content.Position = (state.Mouse.Position - DrawSize / 2) * ParallaxAmount;
return base.OnMouseMove(state);
this.input = input;
}
protected override void Update()
{
base.Update();
content.Position = (ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount;
content.Scale = new Vector2(1 + ParallaxAmount);
}
}