fixed end_pos for sliders

src/fruits/mod.rs

@@ -109,7 +109,7 @@ pub fn stars(
                 if curr_dist < target {
                     for tick_idx in 1.. {
                         let progress = curr_dist / *pixel_len;
-                        let pos = curve.position_at(progress);
+                        let pos = h.pos + curve.position_at(progress);
                         let time = h.start_time + time_add * tick_idx as f32;
                         ticks.push((pos, time));
                         curr_dist += tick_dist;
@@ -136,7 +136,7 @@ pub fn stars(
                         let dist = (span_idx % 2) as f32 * *pixel_len;
                         let time_offset = (duration / span_count as f32) * span_idx as f32;
                         let progress = dist / *pixel_len;
-                        let pos = curve.position_at(progress);
+                        let pos = h.pos + curve.position_at(progress);
 
                         // Reverse tick
                         slider_objects.push((pos, h.start_time + time_offset));
@@ -155,7 +155,7 @@ pub fn stars(
                 }
 
                 // Slider tail
-                let pos = curve.position_at(1.0); // TODO: what if reversing odd amount?
+                let pos = h.pos + curve.position_at(1.0); // TODO: what if reversing odd amount?
                 slider_objects.push((pos, h.start_time + duration));
 
                 fruits += span_count; // TODO: +1?

src/osu/mod.rs

@@ -54,8 +54,7 @@ fn custom_osu() {
 
     use crate::{Beatmap, OsuPP};
 
-    let path = "./maps/2753127.osu";
+    let path = "E:Games/osu!/beatmaps/1402167_.osu";
-    // let path = "E:Games/osu!/beatmaps/2571051.osu";
     let file = File::open(path).unwrap();
 
     let start = Instant::now();
@@ -65,19 +64,19 @@ fn custom_osu() {
     let accum = start.elapsed();
 
     // * Tiny benchmark for map parsing
-    let mut accum = accum;
+    // let mut accum = accum;
 
-    for _ in 0..iters {
+    // for _ in 0..iters {
-        let file = File::open(path).unwrap();
+    //     let file = File::open(path).unwrap();
-        let start = Instant::now();
+    //     let start = Instant::now();
-        let _map = Beatmap::parse(file).unwrap();
+    //     let _map = Beatmap::parse(file).unwrap();
-        accum += start.elapsed();
+    //     accum += start.elapsed();
-    }
+    // }
 
     println!("Parsing average: {:?}", accum / iters);
 
     let start = Instant::now();
-    let result = OsuPP::new(&map).mods(0).calculate();
+    let result = OsuPP::new(&map).mods(1024).calculate();
 
     let iters = 100;
     let accum = start.elapsed();

src/osu/versions/all_included/osu_object.rs

@@ -179,7 +179,6 @@ impl OsuObject {
                 ticks.clear();
 
                 // TODO: what if reversing odd amount?
-                // TODO: Correct addition?
                 let mut end_pos = h.pos + curve.position_at(1.0);
                 travel_dist *= *scaling_factor;
 

src/osu/versions/no_leniency/osu_object.rs

@@ -162,8 +162,7 @@ impl OsuObject {
                 ticks.clear();
 
                 // TODO: what if reversing odd amount?
-                // TODO: + h.pos?
+                let end_pos = h.pos + curve.position_at(1.0);
-                let end_pos = curve.position_at(1.0);
                 travel_dist *= *scaling_factor;
 
                 Self {