1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00

Align logo correctly between intro and main menu.

Kinda hacky but will do for now.
This commit is contained in:
Dean Herbert 2016-12-01 21:59:32 +09:00
parent 413138abe5
commit 22905d2033
2 changed files with 21 additions and 8 deletions

View File

@ -36,11 +36,16 @@ namespace osu.Game.Graphics.Containers
this.input = input;
}
bool firstUpdate = true;
protected override void Update()
{
base.Update();
content.MoveTo((ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount, 1000, EasingTypes.OutQuint);
content.MoveTo((ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
content.Scale = new Vector2(1 + ParallaxAmount);
firstUpdate = false;
}
}
}

View File

@ -8,6 +8,7 @@ using osu.Framework.Audio.Track;
using osu.Framework.GameModes;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Transformations;
using osu.Game.Graphics.Containers;
using osu.Game.Screens.Backgrounds;
using OpenTK.Graphics;
@ -34,14 +35,21 @@ namespace osu.Game.Screens.Menu
{
Children = new Drawable[]
{
logo = new OsuLogo
new ParallaxContainer
{
Alpha = 0,
Triangles = false,
BlendingMode = BlendingMode.Additive,
Interactive = false,
Colour = Color4.DarkGray,
Ripple = false
ParallaxAmount = 0.01f,
Children = new Drawable[]
{
logo = new OsuLogo
{
Alpha = 0,
Triangles = false,
BlendingMode = BlendingMode.Additive,
Interactive = false,
Colour = Color4.DarkGray,
Ripple = false
}
}
}
};
}