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

Always fully display one beat

This commit is contained in:
smoogipoo 2020-05-15 15:49:50 +09:00
parent 4cbd51feb9
commit 392d44e1fb
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
@ -149,6 +150,29 @@ private void setRange(double minTime, double maxTime)
linesAfter.Add(line);
}
// Snapping will always happen on one of the two lines around minTime (the "target" line).
// One of those lines may exist in linesBefore and the other may exist in linesAfter, depending on whether such a line exists, and the target changes when the mid-point is crossed.
// For display purposes, one complete beat is shown at the maximum brightness such that the target line should always be bright.
bool targetLineIsLastLineBefore = false;
if (linesBefore.Count > 0 && linesAfter.Count > 0)
targetLineIsLastLineBefore = Math.Abs(linesBefore[^1].HitObject.StartTime - minTime) <= Math.Abs(linesAfter[0].HitObject.StartTime - minTime);
else if (linesBefore.Count > 0)
targetLineIsLastLineBefore = true;
if (targetLineIsLastLineBefore)
{
// Move the last line before to linesDuring
linesDuring.Insert(0, linesBefore[^1]);
linesBefore.RemoveAt(linesBefore.Count - 1);
}
else if (linesAfter.Count > 0) // = false does not guarantee that a line after exists (maybe at the bottom of the screen)
{
// Move the first line after to linesDuring
linesDuring.Insert(0, linesAfter[0]);
linesAfter.RemoveAt(0);
}
foreach (var l in linesDuring)
l.Colour = OsuColour.Gray(0.5f);