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

Implement mousewheel time scrolling in the editor #2225

Merged
merged 15 commits into from Mar 16, 2018

Conversation

2 participants
@smoogipoo
Contributor

smoogipoo commented Mar 15, 2018

Re-opening this PR.

Prereqs:

Essentially we've decided that when beat snapping, we should always snap to the next beat in the seeking direction, or the next timing point if it occurs before the next beat.

I've also implemented a SeekTo() method which seeks to the closest beat to a time value (since it's non-directional), or the next timing point if any. I believe we'll eventually want this to perform other types of seeking.

@smoogipoo smoogipoo added this to the March 2018 milestone Mar 15, 2018

@smoogipoo smoogipoo added the editor label Mar 15, 2018

@smoogipoo smoogipoo referenced this pull request Mar 15, 2018

Merged

Rewrite the way clocks are handled in the Editor #2226

1 of 1 task complete
@smoogipoo

This comment has been minimized.

Contributor

smoogipoo commented Mar 15, 2018

Note: Seeking/playback in the editor will for the most part (minus scrollwheel) be broken for now due to the new clock being used. Since the change to fix that is kinda massive in its own right (+200LOC), I've split it into a new PR to not pollute this one: #2226

If you want to test in the real editor, you should do so with #2226.

var timingPoint = cpi.TimingPointAt(adjustableClock.CurrentTime);
if (direction < 0 && timingPoint.Time == adjustableClock.CurrentTime)
{
// When going backwards, we care about the timing point that was _previously_ active at the current time

This comment has been minimized.

@peppy

peppy Mar 16, 2018

Member

reword comment plz

peppy and others added some commits Mar 16, 2018

@peppy

peppy approved these changes Mar 16, 2018

@peppy peppy merged commit cbe2de3 into ppy:master Mar 16, 2018

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@smoogipoo smoogipoo deleted the smoogipoo:editor-wheel-movement branch Jun 15, 2018

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