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

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

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

View File

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