RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop the logo from beating

This commit is contained in:
Dean Herbert 2018-05-31 17:14:47 +09:00
parent c161d82474
commit 7487c82ec1
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Screens/Loader.cs
View File

@ -30,6 +30,7 @@ protected override void LogoArriving(OsuLogo logo, bool resuming)
{ {
base.LogoArriving(logo, resuming); base.LogoArriving(logo, resuming);
logo.BeatMatching = false;
logo.Triangles = false; logo.Triangles = false;
logo.Origin = Anchor.BottomRight; logo.Origin = Anchor.BottomRight;
logo.Anchor = Anchor.BottomRight; logo.Anchor = Anchor.BottomRight;

4
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -64,6 +64,8 @@ public bool Triangles
set { colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); } set { colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
} }
public bool BeatMatching = true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos); public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos);
public bool Ripple public bool Ripple
@ -264,6 +266,8 @@ protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint,
{ {
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes); base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
if (!BeatMatching) return;
lastBeatIndex = beatIndex; lastBeatIndex = beatIndex;
var beatLength = timingPoint.BeatLength; var beatLength = timingPoint.BeatLength;

1
osu.Game/Screens/OsuScreen.cs
View File

@ -225,6 +225,7 @@ protected virtual void LogoArriving(OsuLogo logo, bool resuming)
logo.Anchor = Anchor.TopLeft; logo.Anchor = Anchor.TopLeft;
logo.Origin = Anchor.Centre; logo.Origin = Anchor.Centre;
logo.RelativePositionAxes = Axes.None; logo.RelativePositionAxes = Axes.None;
logo.BeatMatching = true;
logo.Triangles = true; logo.Triangles = true;
logo.Ripple = true; logo.Ripple = true;
} }