fix: remove gradual calculation

ppy-sb · Jun 29, 2024 · 0cc7306 · 0cc7306
1 parent 288cb62
commit 0cc7306
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 98 deletions.
diff --git a/src/difficulty.rs b/src/difficulty.rs
@@ -7,12 +7,8 @@ use pyo3::{
 use rosu_pp::Difficulty;
 
 use crate::{
-    attributes::difficulty::PyDifficultyAttributes,
-    beatmap::PyBeatmap,
-    error::ArgsError,
-    gradual::{difficulty::PyGradualDifficulty, performance::PyGradualPerformance},
-    performance::PyPerformance,
-    strains::PyStrains,
+    attributes::difficulty::PyDifficultyAttributes, beatmap::PyBeatmap, error::ArgsError,
+    performance::PyPerformance, strains::PyStrains,
 };
 
 #[pyclass(name = "Difficulty")]
@@ -171,14 +167,6 @@ impl PyDifficulty {
         }
     }
 
-    fn gradual_difficulty(&self, map: &PyBeatmap) -> PyGradualDifficulty {
-        PyGradualDifficulty::new(self, map)
-    }
-
-    fn gradual_performance(&self, map: &PyBeatmap) -> PyGradualPerformance {
-        PyGradualPerformance::new(self, map)
-    }
-
     fn set_mods(&mut self, mods: Option<u32>) {
         self.mods = mods.unwrap_or(0);
     }

diff --git a/src/gradual/difficulty.rs b/src/gradual/difficulty.rs
diff --git a/src/gradual/mod.rs b/src/gradual/mod.rs
diff --git a/src/gradual/performance.rs b/src/gradual/performance.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -11,7 +11,6 @@ use self::{
     beatmap::PyBeatmap,
     difficulty::PyDifficulty,
     error::{ArgsError, ParseError},
-    gradual::{difficulty::PyGradualDifficulty, performance::PyGradualPerformance},
     mode::PyGameMode,
     performance::PyPerformance,
     score_state::PyScoreState,
@@ -25,7 +24,6 @@ mod attributes;
 mod beatmap;
 mod difficulty;
 mod error;
-mod gradual;
 mod mode;
 mod performance;
 mod score_state;
@@ -36,8 +34,6 @@ fn rosu_pp_py(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<PyBeatmap>()?;
     m.add_class::<PyDifficulty>()?;
     m.add_class::<PyPerformance>()?;
-    m.add_class::<PyGradualDifficulty>()?;
-    m.add_class::<PyGradualPerformance>()?;
     m.add_class::<PyBeatmapAttributesBuilder>()?;
 
     m.add_class::<PyGameMode>()?;

diff --git a/src/strains.rs b/src/strains.rs
@@ -17,7 +17,7 @@ define_class! {
         pub aim_no_sliders: DoubleList?,
         pub speed: DoubleList?,
         pub flashlight: DoubleList?,
-        relax: DoubleList?,
+        pub relax: DoubleList?,
         pub color: DoubleList?,
         pub rhythm: DoubleList?,
         pub stamina: DoubleList?,