add stacking back now that it works

This commit is contained in:
Michael Zhang 2021-01-09 15:52:19 -06:00
parent 8d36b7219d
commit d53aff9212
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B

View file

@ -71,7 +71,7 @@ impl Game {
let beatmap = Beatmap::from_osz(&contents)?; let beatmap = Beatmap::from_osz(&contents)?;
self.beatmap = BeatmapExt::new(beatmap); self.beatmap = BeatmapExt::new(beatmap);
self.beatmap.compute_colors(); self.beatmap.compute_colors();
// self.beatmap.compute_stacking(); self.beatmap.compute_stacking();
let dir = path.parent().unwrap(); let dir = path.parent().unwrap();
@ -192,7 +192,10 @@ impl Game {
slider_info = Some((info, spline)); slider_info = Some((info, spline));
let end_pos = ho.inner.end_pos().unwrap(); let end_pos = ho.inner.end_pos().unwrap();
let end_pos = [PLAYFIELD_BOUNDS.x + osupx_scale_x * end_pos.0 as f32, PLAYFIELD_BOUNDS.y + osupx_scale_y*end_pos.1 as f32]; let end_pos = [
PLAYFIELD_BOUNDS.x + osupx_scale_x * end_pos.0 as f32,
PLAYFIELD_BOUNDS.y + osupx_scale_y * end_pos.1 as f32,
];
self.skin.hitcircle.draw( self.skin.hitcircle.draw(
ctx, ctx,
(cs_real * 2.0, cs_real * 2.0), (cs_real * 2.0, cs_real * 2.0),