optimize arrow key movement by storing current timing point
This commit is contained in:
parent
d107e7670b
commit
ef13c41657
1 changed files with 61 additions and 17 deletions
|
@ -19,7 +19,7 @@ use libosu::{
|
||||||
hitobject::{HitObjectKind, SpinnerInfo},
|
hitobject::{HitObjectKind, SpinnerInfo},
|
||||||
math::Point,
|
math::Point,
|
||||||
spline::Spline,
|
spline::Spline,
|
||||||
timing::TimingPointKind,
|
timing::{TimingPoint, TimingPointKind},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::audio::{AudioEngine, Sound};
|
use crate::audio::{AudioEngine, Sound};
|
||||||
|
@ -39,6 +39,9 @@ pub struct Game {
|
||||||
pub skin: Skin,
|
pub skin: Skin,
|
||||||
frame: usize,
|
frame: usize,
|
||||||
slider_cache: SliderCache,
|
slider_cache: SliderCache,
|
||||||
|
|
||||||
|
current_uninherited_timing_point: Option<TimingPoint>,
|
||||||
|
current_inherited_timing_point: Option<TimingPoint>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Game {
|
impl Game {
|
||||||
|
@ -57,6 +60,9 @@ impl Game {
|
||||||
skin,
|
skin,
|
||||||
frame: 0,
|
frame: 0,
|
||||||
slider_cache: SliderCache::default(),
|
slider_cache: SliderCache::default(),
|
||||||
|
|
||||||
|
current_uninherited_timing_point: None,
|
||||||
|
current_inherited_timing_point: None,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -273,17 +279,56 @@ impl Game {
|
||||||
|
|
||||||
graphics::present(ctx)?;
|
graphics::present(ctx)?;
|
||||||
self.frame += 1;
|
self.frame += 1;
|
||||||
|
if self.is_playing {
|
||||||
|
self.timestamp_changed()?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn seek_by_steps(&self, n: i32) -> Result<()> {
|
fn timestamp_changed(&mut self) -> Result<()> {
|
||||||
|
if let Some(song) = &self.song {
|
||||||
|
let pos = song.position()?;
|
||||||
|
|
||||||
|
let mut found_uninherited = false;
|
||||||
|
let mut found_inherited = false;
|
||||||
|
for timing_point in self.beatmap.inner.timing_points.iter() {
|
||||||
|
if timing_point.time.as_seconds() > pos {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
match &timing_point.kind {
|
||||||
|
TimingPointKind::Uninherited(_) => {
|
||||||
|
self.current_uninherited_timing_point = Some(timing_point.clone());
|
||||||
|
found_uninherited = true;
|
||||||
|
}
|
||||||
|
TimingPointKind::Inherited(_) => {
|
||||||
|
self.current_inherited_timing_point = Some(timing_point.clone());
|
||||||
|
found_inherited = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if found_inherited && found_uninherited {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn seek_by_steps(&mut self, n: i32) -> Result<()> {
|
||||||
if let Some(song) = &self.song {
|
if let Some(song) = &self.song {
|
||||||
let pos = song.position()?;
|
let pos = song.position()?;
|
||||||
let mut delta = None;
|
let mut delta = None;
|
||||||
for timing_point in self.beatmap.inner.timing_points.iter() {
|
if let Some(TimingPoint {
|
||||||
if let TimingPointKind::Uninherited(info) = &timing_point.kind {
|
kind: TimingPointKind::Uninherited(info),
|
||||||
if pos > timing_point.time.as_seconds() {
|
time,
|
||||||
let diff = pos - timing_point.time.as_seconds();
|
..
|
||||||
|
}) = &self.current_uninherited_timing_point
|
||||||
|
{
|
||||||
|
if pos > time.as_seconds() {
|
||||||
|
let diff = pos - time.as_seconds();
|
||||||
let tick = info.mpb / 1000.0 / info.meter as f64;
|
let tick = info.mpb / 1000.0 / info.meter as f64;
|
||||||
let beats = (diff / tick).round();
|
let beats = (diff / tick).round();
|
||||||
let frac = diff - beats * tick;
|
let frac = diff - beats * tick;
|
||||||
|
@ -296,12 +341,11 @@ impl Game {
|
||||||
delta = Some((n - 1) as f64 * tick - frac);
|
delta = Some((n - 1) as f64 * tick - frac);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(delta) = delta {
|
if let Some(delta) = delta {
|
||||||
song.set_position(pos + delta)?;
|
song.set_position(pos + delta)?;
|
||||||
|
self.timestamp_changed()?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
Loading…
Reference in a new issue