From 9938084343b989ef7dada28656c1444412297683 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 24 Nov 2016 15:30:55 +0900 Subject: [PATCH 1/3] Make parallax container work with global mouse state (so it ignores bounds checks). --- osu.Game/Graphics/Containers/ParallaxContainer.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 52029dbf8e..4c675adc60 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -25,18 +25,20 @@ namespace osu.Game.Graphics.Containers } private Container content; + private InputManager input; protected override Container 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 = (input.CurrentState.Mouse.Position - DrawSize / 2) * ParallaxAmount; content.Scale = new Vector2(1 + ParallaxAmount); } } From c48acd4c3da9a757726e9e475a95453f99479de2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 24 Nov 2016 16:17:40 +0900 Subject: [PATCH 2/3] Fix coordinates being in wrong space. --- osu.Game/Graphics/Containers/ParallaxContainer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs index 4c675adc60..cf61529cd2 100644 --- a/osu.Game/Graphics/Containers/ParallaxContainer.cs +++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs @@ -38,7 +38,7 @@ namespace osu.Game.Graphics.Containers protected override void Update() { base.Update(); - content.Position = (input.CurrentState.Mouse.Position - DrawSize / 2) * ParallaxAmount; + content.Position = (ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount; content.Scale = new Vector2(1 + ParallaxAmount); } } From 29d6c47a3fc09c5f162e1fb68efdae447aee3900 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 24 Nov 2016 17:09:08 +0900 Subject: [PATCH 3/3] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 1a521bb22c..71bbc98060 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 1a521bb22cfd2c14f58d4cd60fbbfdb70ea8f87b +Subproject commit 71bbc980602829cf7eb0db537ebaa2f9668acda5