updated rosu-pp to v0.5.1
This commit is contained in:
Generated
+2
-2
@@ -194,9 +194,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rosu-pp"
|
||||
version = "0.4.0"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4efb6f419a910e96683aada6e12c14f4a4b1da286f1a205a1edc3eca3b8fa69e"
|
||||
checksum = "4aabced000e59b935e34c56babea216f9cc247402603dab69808eb3969793707"
|
||||
|
||||
[[package]]
|
||||
name = "rosu-pp-py"
|
||||
|
||||
+1
-1
@@ -12,4 +12,4 @@ crate-type = ["cdylib"]
|
||||
|
||||
[dependencies]
|
||||
pyo3 = { version = "0.15.1", features = ["macros", "extension-module"] }
|
||||
rosu-pp = { version = "0.4" }
|
||||
rosu-pp = { version = "0.5" }
|
||||
+11
-3
@@ -12,7 +12,7 @@ use pyo3::{
|
||||
PyObjectProtocol,
|
||||
};
|
||||
use rosu_pp::{
|
||||
fruits::FruitsPerformanceAttributes, mania::ManiaPerformanceAttributes,
|
||||
catch::CatchPerformanceAttributes, mania::ManiaPerformanceAttributes,
|
||||
osu::OsuPerformanceAttributes, taiko::TaikoPerformanceAttributes, AnyPP, Beatmap,
|
||||
BeatmapAttributes, BeatmapExt, PerformanceAttributes,
|
||||
};
|
||||
@@ -58,7 +58,15 @@ impl Calculator {
|
||||
|
||||
let difficulty = mod_diffs
|
||||
.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();
|
||||
|
||||
let calculator = params.apply(AnyPP::new(&self.0).attributes(difficulty));
|
||||
@@ -163,7 +171,7 @@ impl CalculateResult {
|
||||
let bpm = map.bpm() * clock_rate;
|
||||
|
||||
match attrs {
|
||||
PerformanceAttributes::Fruits(FruitsPerformanceAttributes { pp, difficulty }) => Self {
|
||||
PerformanceAttributes::Catch(CatchPerformanceAttributes { pp, difficulty }) => Self {
|
||||
mode: 2,
|
||||
pp,
|
||||
stars: difficulty.stars,
|
||||
|
||||
Reference in New Issue
Block a user