osu/editor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix slider rendering past the pixel-length end of bezier sliders

Browse source
This commit is contained in:
Michael Zhang 2021-01-08 07:49:43 -06:00
parent ce7c14c1c9
commit ad0de3d46f
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
1 changed files with 33 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/slider_render.rs
View file

@ -167,37 +167,64 @@ impl Spline {
c c
} }
SliderSplineKind::Bezier => { SliderSplineKind::Bezier => {
// split the curve by red-anchors
let mut idx = 0; let mut idx = 0;
let mut whole = Vec::new(); let mut whole = Vec::new();
let mut cumul_length = 0.0;
let mut last_circ: Option<P> = None;
let mut check_push = |whole: &mut Vec<P>, point: P| -> bool {
if cumul_length < pixel_length {
whole.push(point);
if let Some(circ) = last_circ {
cumul_length += circ.distance(point);
}
last_circ = Some(point);
true
} else {
false
}
};
// split the curve by red-anchors
for i in 1..points.len() { for i in 1..points.len() {
if points[i].0 == points[i - 1].0 && points[i].1 == points[i - 1].1 { if points[i].0 == points[i - 1].0 && points[i].1 == points[i - 1].1 {
let spline = calculate_bezier(&points[idx..i]); let spline = calculate_bezier(&points[idx..i]);
// check if it's equal to the last thing that was added to whole
if let Some(last) = whole.last() { if let Some(last) = whole.last() {
if spline[0] != *last { if spline[0] != *last {
whole.push(spline[0]); check_push(&mut whole, spline[0]);
} }
} else { } else {
whole.push(spline[0]); check_push(&mut whole, spline[0]);
} }
// add points, making sure no 2 are the same
for points in spline.windows(2) { for points in spline.windows(2) {
if points[0] != points[1] { if points[0] != points[1] {
whole.push(points[1]); if !check_push(&mut whole, points[1]) {
break;
}
} }
} }
idx = i; idx = i;
continue; continue;
} }
} }
let spline = calculate_bezier(&points[idx..]); let spline = calculate_bezier(&points[idx..]);
if let Some(last) = whole.last() { if let Some(last) = whole.last() {
if spline[0] != *last { if spline[0] != *last {
whole.push(spline[0]); check_push(&mut whole, spline[0]);
} }
} else {
check_push(&mut whole, spline[0]);
} }
for points in spline.windows(2) { for points in spline.windows(2) {
if points[0] != points[1] { if points[0] != points[1] {
whole.push(points[1]); if !check_push(&mut whole, points[1]) {
break;
}
} }
} }
whole whole