fruits, mania & taiko: handle 2nd object separately

src/fruits/mod.rs

@@ -205,6 +205,32 @@ pub fn stars(map: &Beatmap, mods: impl Mods) -> DifficultyAttributes {
         &mut last_excess,
     );
 
+    // Handle second object separately to remove later if-branching
+    let next = hit_objects.next().unwrap();
+    curr.init_hyper_dash(
+        half_catcher_width,
+        &next,
+        &mut last_direction,
+        &mut last_excess,
+    );
+
+    let h = DifficultyObject::new(
+        &curr,
+        &prev,
+        movement.half_catcher_width,
+        attributes.clock_rate,
+    );
+
+    while h.base.time > current_section_end {
+        current_section_end += section_len;
+    }
+
+    movement.process(&h);
+
+    prev = curr;
+    curr = next;
+
+    // Handle all other objects
     for next in hit_objects {
         curr.init_hyper_dash(
             half_catcher_width,

src/fruits/movement.rs

@@ -47,17 +47,12 @@ impl Movement {
 
     #[inline]
     pub(crate) fn save_current_peak(&mut self) {
-        // TODO: Remove branching
-        if self.prev_time.is_some() {
-            self.strain_peaks.push(self.current_section_peak);
-        }
+        self.strain_peaks.push(self.current_section_peak);
     }
 
     #[inline]
     pub(crate) fn start_new_section_from(&mut self, time: f32) {
-        if let Some(prev_time) = self.prev_time {
-            self.current_section_peak = self.peak_strain(time - prev_time);
-        }
+        self.current_section_peak = self.peak_strain(time - self.prev_time.unwrap());
     }
 
     pub(crate) fn process(&mut self, current: &DifficultyObject) {