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

updated rosu-pp to v0.5.1

Browse Source
This commit is contained in:
MaxOhn
2022-03-21 22:37:35 +01:00
parent df29791454
commit c90e123f6c
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+2 -2
View File
@@ -194,9 +194,9 @@ dependencies = [
[[package]] [[package]]
name = "rosu-pp" name = "rosu-pp"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4efb6f419a910e96683aada6e12c14f4a4b1da286f1a205a1edc3eca3b8fa69e" checksum = "4aabced000e59b935e34c56babea216f9cc247402603dab69808eb3969793707"
[[package]] [[package]]
name = "rosu-pp-py" name = "rosu-pp-py"
Cargo.toml
+1 -1
View File
@@ -12,4 +12,4 @@ crate-type = ["cdylib"]
[dependencies] [dependencies]
pyo3 = { version = "0.15.1", features = ["macros", "extension-module"] } pyo3 = { version = "0.15.1", features = ["macros", "extension-module"] }
rosu-pp = { version = "0.4" } rosu-pp = { version = "0.5" }
src/lib.rs
+11 -3
View File
@@ -12,7 +12,7 @@ use pyo3::{
PyObjectProtocol, PyObjectProtocol,
}; };
use rosu_pp::{ use rosu_pp::{
fruits::FruitsPerformanceAttributes, mania::ManiaPerformanceAttributes, catch::CatchPerformanceAttributes, mania::ManiaPerformanceAttributes,
osu::OsuPerformanceAttributes, taiko::TaikoPerformanceAttributes, AnyPP, Beatmap, osu::OsuPerformanceAttributes, taiko::TaikoPerformanceAttributes, AnyPP, Beatmap,
BeatmapAttributes, BeatmapExt, PerformanceAttributes, BeatmapAttributes, BeatmapExt, PerformanceAttributes,
}; };
@@ -58,7 +58,15 @@ impl Calculator {
let difficulty = mod_diffs let difficulty = mod_diffs
.entry((mods, params.passed_objects)) .entry((mods, params.passed_objects))
.or_insert_with(|| self.0.stars(mods, params.passed_objects)) .or_insert_with(|| {
let mut calculator = self.0.stars().mods(mods);
if let Some(passed_objects) = params.passed_objects {
calculator = calculator.passed_objects(passed_objects);
}
calculator.calculate()
})
.to_owned(); .to_owned();
let calculator = params.apply(AnyPP::new(&self.0).attributes(difficulty)); let calculator = params.apply(AnyPP::new(&self.0).attributes(difficulty));
@@ -163,7 +171,7 @@ impl CalculateResult {
let bpm = map.bpm() * clock_rate; let bpm = map.bpm() * clock_rate;
match attrs { match attrs {
PerformanceAttributes::Fruits(FruitsPerformanceAttributes { pp, difficulty }) => Self { PerformanceAttributes::Catch(CatchPerformanceAttributes { pp, difficulty }) => Self {
mode: 2, mode: 2,
pp, pp,
stars: difficulty.stars, stars: difficulty.stars,