Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Parallax fixes. #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tom94 merged 3 commits into from
Nov 24, 2016
Merged

Parallax fixes. #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9938084
Make parallax container work with global mouse state (so it ignores b…
peppy Nov 24, 2016
c48acd4
Fix coordinates being in wrong space.
peppy Nov 24, 2016
29d6c47
Update framework.
peppy Nov 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu-framework
Open in desktop
Submodule osu-framework updated 16 files
+4 −12 osu.Framework.Desktop/Input/Handlers/Keyboard/OpenTKKeyboardHandler.cs
+28 −24 osu.Framework.Desktop/Input/Handlers/Mouse/OpenTKMouseHandler.cs
+1 −1 osu.Framework/Allocation/DependencyContainer.cs
+1 −0 osu.Framework/Audio/Track/AudioTrackBass.cs
+2 −0 osu.Framework/BaseGame.cs
+1 −1 osu.Framework/Graphics/Containers/Container.cs
+1 −1 osu.Framework/Graphics/Containers/ScrollContainer.cs
+2 −2 osu.Framework/Graphics/Cursor/CursorContainer.cs
+11 −0 osu.Framework/Graphics/Drawable.cs
+4 −15 osu.Framework/Graphics/Drawable_Interaction.cs
+1 −1 osu.Framework/Graphics/IDrawable.cs
+1 −1 osu.Framework/Graphics/UserInterface/SliderBar.cs
+1 −1 osu.Framework/Graphics/UserInterface/TextBox.cs
+10 −10 osu.Framework/Input/InputManager.cs
+1 −1 osu.Framework/Input/MouseState.cs
+2 −0 osu.Framework/Platform/BasicGameHost.cs
8 changes: 5 additions & 3 deletions osu.Game/Graphics/Containers/ParallaxContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,20 @@ public ParallaxContainer()
}

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