Merge branch 'master' of github.com:ppy/osu into general-fixes

This commit is contained in:
Tom94 2016-11-24 20:26:44 +01:00
commit 97b0da1d6b

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);
}
}