h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 12:23:21 +08:00
Code Issues Releases Wiki Activity

Align logo correctly between intro and main menu.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -36,11 +36,16 @@ namespace osu.Game.Graphics.Containers
this.input = input; this.input = input;
} }
bool firstUpdate = true;
protected override void Update() protected override void Update()
{ {
base.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); content.Scale = new Vector2(1 + ParallaxAmount);
firstUpdate = false;
} }
} }
} }

22
osu.Game/Screens/Menu/Intro.cs
View File

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