Skip to content

Commit 5d76a0e

Browse files
committed
Revert "fix: rpe line length"
This reverts commit c042019.
1 parent 5276899 commit 5d76a0e

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

prpr/src/parse/rpe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -695,22 +695,22 @@ async fn parse_judge_line(
695695
res.map_value(|v| v * factor);
696696
Ok(res)
697697
}
698-
let factor = if rpe.texture == "line.png" { 4000. / RPE_WIDTH / 6. } else { 2. / RPE_WIDTH };
698+
let image_factor = if rpe.texture == "line.png" { 1. } else { 2. / RPE_WIDTH };
699699
rpe.extended
700700
.as_ref()
701701
.map(|e| -> Result<_> {
702702
Ok(AnimVector(
703703
parse(
704704
r,
705705
&e.scale_x_events,
706-
factor,
706+
image_factor,
707707
bezier_map,
708708
)?,
709-
parse(r, &e.scale_y_events, factor, bezier_map)?,
709+
parse(r, &e.scale_y_events, image_factor, bezier_map)?,
710710
))
711711
})
712712
.transpose()?
713-
.unwrap_or(AnimVector::fixed(Vector::new(factor, factor)))
713+
.unwrap_or(AnimVector::fixed(Vector::new(image_factor, image_factor)))
714714
},
715715
},
716716
ctrl_obj: RefCell::new(CtrlObject {

prpr/src/scene/game.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::{
1616
fs::FileSystem,
1717
info::{ChartFormat, ChartInfo},
1818
judge::Judge,
19-
parse::{parse_extra, parse_pec, parse_phigros, parse_rpe},
19+
parse::{RPE_WIDTH, parse_extra, parse_pec, parse_phigros, parse_rpe},
2020
task::Task,
2121
time::TimeManager,
2222
ui::{RectButton, TextPainter, Ui},
@@ -293,6 +293,10 @@ impl GameScene {
293293
.await
294294
.context("Failed to load resources")?;
295295

296+
if matches!(chart_format, ChartFormat::Rpe) {
297+
res.info.line_length *= 4000. / RPE_WIDTH / 6.;
298+
}
299+
296300
// Prepare extra sfx from chart.hitsounds
297301
chart.hitsounds.drain().for_each(|(name, clip)| {
298302
if let Ok(clip) = res.create_sfx(clip) {

0 commit comments

Comments
 (0)