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

parse curve points within range

Browse Source
This commit is contained in:
MaxOhn
2023-01-28 15:08:38 +01:00
parent 06320468c5
commit 0c6d2e747f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parse/mod.rs
+6 -3
View File
@@ -792,7 +792,7 @@ impl Beatmap {
mod slider_parsing { mod slider_parsing {
use crate::ParseError; use crate::ParseError;
use super::Pos2; use super::{InRange, Pos2, MAX_COORDINATE_VALUE};
pub(super) fn convert_points( pub(super) fn convert_points(
points: &[&str], points: &[&str],
@@ -893,10 +893,13 @@ mod slider_parsing {
} }
pub(super) fn read_point(value: &str, start_pos: Pos2) -> Result<PathControlPoint, ParseError> { pub(super) fn read_point(value: &str, start_pos: Pos2) -> Result<PathControlPoint, ParseError> {
let mut v = value.split(':').map(str::parse); let mut v = value
.split(':')
.flat_map(|s| f64::parse_in_custom_range(s, MAX_COORDINATE_VALUE as f64))
.map(|n| n as i32 as f32);
match (v.next(), v.next()) { match (v.next(), v.next()) {
(Some(Ok(x)), Some(Ok(y))) => Ok(PathControlPoint::from(Pos2 { x, y } - start_pos)), (Some(x), Some(y)) => Ok(PathControlPoint::from(Pos2 { x, y } - start_pos)),
_ => Err(ParseError::InvalidCurvePoints), _ => Err(ParseError::InvalidCurvePoints),
} }
} }