osu/editor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move by a whole measure

Browse source
This commit is contained in:
Michael Zhang 2021-01-10 02:06:43 -06:00
parent ef13c41657
commit 99b6a02d8e
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/game/mod.rs
View file

@ -3,7 +3,7 @@ mod seeker;
mod sliders;
mod timeline;
use std::collections::HashMap;
use std::collections::{HashMap, HashSet};
use std::fs::File;
use std::io::Read;
use std::path::Path;
@ -40,6 +40,7 @@ pub struct Game {
frame: usize,
slider_cache: SliderCache,
keymap: HashSet<KeyCode>,
current_uninherited_timing_point: Option<TimingPoint>,
current_inherited_timing_point: Option<TimingPoint>,
}
@ -61,6 +62,7 @@ impl Game {
frame: 0,
slider_cache: SliderCache::default(),
keymap: HashSet::new(),
current_uninherited_timing_point: None,
current_inherited_timing_point: None,
})
@ -366,14 +368,37 @@ impl EventHandler for Game {
};
}
fn key_down_event(&mut self, _: &mut Context, keycode: KeyCode, _: KeyMods, _: bool) {
fn key_down_event(&mut self, _: &mut Context, keycode: KeyCode, mods: KeyMods, _: bool) {
use KeyCode::*;
self.keymap.insert(keycode);
match keycode {
Left => {
self.seek_by_steps(-1);
if let Some(TimingPoint {
kind: TimingPointKind::Uninherited(info),
..
}) = &self.current_uninherited_timing_point
{
let steps = -1 * if mods.contains(KeyMods::SHIFT) {
info.meter as i32
} else {
1
};
self.seek_by_steps(steps);
}
}
Right => {
self.seek_by_steps(1);
if let Some(TimingPoint {
kind: TimingPointKind::Uninherited(info),
..
}) = &self.current_uninherited_timing_point
{
let steps = if mods.contains(KeyMods::SHIFT) {
info.meter as i32
} else {
1
};
self.seek_by_steps(steps);
}
}
_ => {}
};