RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 02:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert the ParallaxContainer changes I made by accident back.

Browse Source
This commit is contained in:
KoziLord 2018-05-16 01:27:18 +02:00
parent c44d07e9c6
commit 1e88f216f2
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ namespace osu.Game.Graphics.Containers
if (!parallaxEnabled) if (!parallaxEnabled)
{ {
content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, Easing.OutQuint); content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, Easing.OutQuint);
content.Scale = new Vector2(1 + System.Math.Abs(ParallaxAmount)); content.Scale = new Vector2(1 + ParallaxAmount);
} }
}; };
} }
@ -69,7 +69,7 @@ namespace osu.Game.Graphics.Containers
double elapsed = MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 1000); double elapsed = MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 1000);
content.Position = Interpolation.ValueAt(elapsed, content.Position, offset, 0, 1000, Easing.OutQuint); content.Position = Interpolation.ValueAt(elapsed, content.Position, offset, 0, 1000, Easing.OutQuint);
content.Scale = Interpolation.ValueAt(elapsed, content.Scale, new Vector2(1 + System.Math.Abs(ParallaxAmount)), 0, 1000, Easing.OutQuint); content.Scale = Interpolation.ValueAt(elapsed, content.Scale, new Vector2(1 + ParallaxAmount), 0, 1000, Easing.OutQuint);
} }
firstUpdate = false; firstUpdate = false;

5
osu.Game/Screens/Ranking/Results.cs
View File

@ -160,10 +160,7 @@ namespace osu.Game.Screens.Ranking
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ParallaxAmount = 0.01f, ParallaxAmount = 0.01f,
//Compensate for the Toolbar Scale = new Vector2(1 / circle_outer_scale / overscan),
Scale = new Vector2(1.06f / circle_outer_scale / overscan),
//Offset the background to account for the toolbar.
Position = new Vector2(0, -20),
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Children = new Drawable[] Children = new Drawable[]