EZPPFarm/akatsuki-pp-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed od flooring

Browse Source
This commit is contained in:
MaxOhn
2021-11-07 23:05:18 +01:00
parent 5b2f32a897
commit 3aa7bbe39f
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/osu/mod.rs
+2 -2
View File
@@ -54,7 +54,7 @@ fn custom_osu() {
use crate::{Beatmap, OsuPP}; use crate::{Beatmap, OsuPP};
let path = "E:Games/osu!/beatmaps/1402167_.osu"; let path = "E:Games/osu!/beatmaps/1402167.osu";
let file = File::open(path).unwrap(); let file = File::open(path).unwrap();
let start = Instant::now(); let start = Instant::now();
@@ -76,7 +76,7 @@ fn custom_osu() {
println!("Parsing average: {:?}", accum / iters); println!("Parsing average: {:?}", accum / iters);
let start = Instant::now(); let start = Instant::now();
let result = OsuPP::new(&map).mods(1024).calculate(); let result = OsuPP::new(&map).mods(64 + 16).calculate();
let iters = 100; let iters = 100;
let accum = start.elapsed(); let accum = start.elapsed();
src/osu/versions/all_included/mod.rs
+2 -4
View File
@@ -47,8 +47,7 @@ pub fn stars(
let take = passed_objects.unwrap_or_else(|| map.hit_objects.len()); let take = passed_objects.unwrap_or_else(|| map.hit_objects.len());
let map_attributes = map.attributes().mods(mods); let map_attributes = map.attributes().mods(mods);
let hit_window = let hit_window = super::difficulty_range_od(map_attributes.od) / map_attributes.clock_rate;
super::difficulty_range_od(map_attributes.od).floor() / map_attributes.clock_rate;
let od = (80.0 - hit_window) / 6.0; let od = (80.0 - hit_window) / 6.0;
let mut diff_attributes = DifficultyAttributes { let mut diff_attributes = DifficultyAttributes {
@@ -245,8 +244,7 @@ pub fn stars(
/// Suitable to plot the difficulty of a map over time. /// Suitable to plot the difficulty of a map over time.
pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains { pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains {
let map_attributes = map.attributes().mods(mods); let map_attributes = map.attributes().mods(mods);
let hit_window = let hit_window = super::difficulty_range_od(map_attributes.od) / map_attributes.clock_rate;
super::difficulty_range_od(map_attributes.od).floor() / map_attributes.clock_rate;
let od = (80.0 - hit_window) / 6.0; let od = (80.0 - hit_window) / 6.0;
let mut diff_attributes = DifficultyAttributes { let mut diff_attributes = DifficultyAttributes {
src/osu/versions/no_leniency/mod.rs
+1 -2
View File
@@ -213,8 +213,7 @@ pub fn stars(
/// Suitable to plot the difficulty of a map over time. /// Suitable to plot the difficulty of a map over time.
pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains { pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains {
let map_attributes = map.attributes().mods(mods); let map_attributes = map.attributes().mods(mods);
let hit_window = let hit_window = super::difficulty_range_od(map_attributes.od) / map_attributes.clock_rate;
super::difficulty_range_od(map_attributes.od).floor() / map_attributes.clock_rate;
let od = (80.0 - hit_window) / 6.0; let od = (80.0 - hit_window) / 6.0;
let mut diff_attributes = DifficultyAttributes { let mut diff_attributes = DifficultyAttributes {
src/osu/versions/no_sliders_no_leniency/mod.rs
+2 -2
View File
@@ -42,7 +42,7 @@ pub fn stars(
let take = passed_objects.unwrap_or_else(|| map.hit_objects.len()); let take = passed_objects.unwrap_or_else(|| map.hit_objects.len());
let attributes = map.attributes().mods(mods); let attributes = map.attributes().mods(mods);
let hit_window = super::difficulty_range_od(attributes.od).floor() / attributes.clock_rate; let hit_window = super::difficulty_range_od(attributes.od) / attributes.clock_rate;
let od = (80.0 - hit_window) / 6.0; let od = (80.0 - hit_window) / 6.0;
if take < 2 { if take < 2 {
@@ -219,7 +219,7 @@ pub fn stars(
/// Suitable to plot the difficulty of a map over time. /// Suitable to plot the difficulty of a map over time.
pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains { pub fn strains(map: &Beatmap, mods: impl Mods) -> Strains {
let attributes = map.attributes().mods(mods); let attributes = map.attributes().mods(mods);
let hit_window = super::difficulty_range_od(attributes.od).floor() / attributes.clock_rate; let hit_window = super::difficulty_range_od(attributes.od) / attributes.clock_rate;
if map.hit_objects.len() < 2 { if map.hit_objects.len() < 2 {
return Strains::default(); return Strains::default();