New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add beat syncing container #828

Merged
merged 19 commits into from May 23, 2017

Conversation

3 participants
@smoogipoo
Contributor

smoogipoo commented May 22, 2017

Superseeds #777.

@ColdVolcano ColdVolcano referenced this pull request May 22, 2017

Merged

Menu flashes #812

3 of 3 tasks complete

@smoogipoo smoogipoo changed the title from Cold volcano/beat syncing to Beat syncing container May 22, 2017

@ColdVolcano

This comment has been minimized.

Show comment
Hide comment
@ColdVolcano

ColdVolcano May 22, 2017

Contributor

Somehow the file is not in the csproj

Contributor

ColdVolcano commented May 22, 2017

Somehow the file is not in the csproj

@smoogipoo

This comment has been minimized.

Show comment
Hide comment
@smoogipoo

smoogipoo May 22, 2017

Contributor

:PsyLikeThis:

Contributor

smoogipoo commented May 22, 2017

:PsyLikeThis:

@smoogipoo smoogipoo changed the title from Beat syncing container to Add beat syncing container May 22, 2017

ColdVolcano added a commit to ColdVolcano/osu that referenced this pull request May 22, 2017

Show outdated Hide outdated osu.Game/Graphics/Containers/BeatSyncedContainer.cs
/// <summary>
/// A new beat will not be sent if the time since the beat is larger than this tolerance.
/// </summary>
private const int seek_tolerance = 20;

This comment has been minimized.

@peppy

peppy May 22, 2017

Member

won't this container stop working completely at 50fps or less?

@peppy

peppy May 22, 2017

Member

won't this container stop working completely at 50fps or less?

Show outdated Hide outdated osu.Game/Graphics/Containers/BeatSyncedContainer.cs
ControlPoint controlPoint = beatmap.Value.Beatmap.TimingInfo.TimingPointAt(currentTrackTime, out overridePoint);
bool kiai = (overridePoint ?? controlPoint).KiaiMode;
int beat = controlPoint.BeatLength > 0 ? (int)((currentTrackTime - controlPoint.Time) / controlPoint.BeatLength) : 0;

This comment has been minimized.

@peppy

peppy May 22, 2017

Member

can't we just return early if BeatLength == 0 and avoid this ?:?

@peppy

peppy May 22, 2017

Member

can't we just return early if BeatLength == 0 and avoid this ?:?

@peppy

as above

@peppy

peppy approved these changes May 23, 2017

@peppy peppy merged commit d1eb893 into ppy:master May 23, 2017

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@smoogipoo smoogipoo deleted the smoogipoo:ColdVolcano/beat-syncing branch Feb 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment