Skip to content

refactor: judge #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
2278535805 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

refactor: judge #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44bffd0
refactor: judge
2278535805 Jul 18, 2025
b93111f
fix: hit sound
2278535805 Jul 18, 2025
d76fb74
fix: horizontal judgment is too strict
2278535805 Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions prpr/src/bin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ impl BinaryData for Note {
multiple_hint: false,
fake: r.read()?,
judge: JudgeStatus::NotJudged,
protected: false,
})
}

Expand Down
1 change: 1 addition & 0 deletions prpr/src/core/note.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pub struct Note {
pub multiple_hint: bool,
pub fake: bool,
pub judge: JudgeStatus,
pub protected: bool,
}

pub struct RenderConfig<'a> {
Expand Down
78 changes: 54 additions & 24 deletions prpr/src/judge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use crate::{
config::Config,
core::{BadNote, Chart, NoteKind, Point, Resource, Vector, NOTE_WIDTH_RATIO_BASE},
core::{BadNote, Chart, Note, NoteKind, Point, Resource, Vector, NOTE_WIDTH_RATIO_BASE},
ext::{get_viewport, NotNanExt},
};
use macroquad::prelude::{
Expand All @@ -18,10 +18,11 @@ use tracing::debug;

pub const FLICK_SPEED_THRESHOLD: f32 = 0.8;
pub const LIMIT_PERFECT: f32 = 0.08;
pub const LIMIT_GOOD: f32 = 0.16;
pub const LIMIT_GOOD: f32 = 0.18;
pub const LIMIT_BAD: f32 = 0.22;
pub const UP_TOLERANCE: f32 = 0.05;
pub const DIST_FACTOR: f32 = 0.2;
const LATE_OFFSET: f32 = 0.13;

const EARLY_OFFSET: f32 = 0.07;

Expand Down Expand Up @@ -513,11 +514,9 @@ impl Judge {
continue;
}
let t = time_of(touch);
let mut closest = (None, X_DIFF_MAX, LIMIT_BAD, LIMIT_BAD + (X_DIFF_MAX / NOTE_WIDTH_RATIO_BASE - 1.).max(0.) * DIST_FACTOR);
let mut closest = (None, X_DIFF_MAX, LIMIT_BAD, LIMIT_BAD + (X_DIFF_MAX / NOTE_WIDTH_RATIO_BASE - 1.).max(0.) * DIST_FACTOR, 0.);
for (line_id, ((line, pos), (idx, st))) in chart.lines.iter_mut().zip(pos.iter()).zip(self.notes.iter_mut()).enumerate() {
let Some(pos) = pos[id] else {
continue;
};
let Some(pos) = pos[id] else { continue; };
for id in &idx[*st..] {
let note = &mut line.notes[*id as usize];
if !matches!(note.judge, JudgeStatus::NotJudged | JudgeStatus::PreJudge) {
Expand All @@ -527,45 +526,76 @@ impl Judge {
continue;
}
let dt = (note.time - t) / spd;
if dt >= closest.3 {
if dt.abs() >= closest.3.abs() {
break;
}
let dt = if dt < 0. { (dt + EARLY_OFFSET).min(0.).abs() } else { dt };
let x = &mut note.object.translation.0;
x.set_time(t);
let dist = (x.now() - pos.x).abs();
let posx = pos.x;
let dist = (x.now() - posx).abs();
if dist > X_DIFF_MAX {
continue;
}
if dt
> if matches!(note.kind, NoteKind::Click) {
LIMIT_BAD - LIMIT_PERFECT * (dist - 0.9).max(0.)
if dt.abs() >
if matches!(note.kind, NoteKind::Click) {
LIMIT_BAD
} else {
LIMIT_GOOD
}
{
continue;
}
let dt = if matches!(note.kind, NoteKind::Flick | NoteKind::Drag) {
dt + LIMIT_GOOD
let dist_key = (dist / NOTE_WIDTH_RATIO_BASE - 1.).max(0.) * DIST_FACTOR;
let key = if matches!(note.kind, NoteKind::Flick | NoteKind::Drag) { // Low Priority
dt.abs() + LIMIT_BAD
} else if dt < -LIMIT_GOOD { // Prevent Late Bad
dt.abs()
} else if dt < 0.0 {
(dt + LATE_OFFSET).min(0.0).abs() // Protect Late Good
} else {
dt
dt.abs()
};
let key = dt + (dist / NOTE_WIDTH_RATIO_BASE - 1.).max(0.) * DIST_FACTOR;
let key = key + dist_key;
if key < closest.3 {
closest = (Some((line_id, *id)), dist, dt, key);
closest = (Some((line_id, *id)), dist, dt, key, posx);
}
}
}
if let (Some((line_id, id)), _, dt, _) = closest {
let line = &mut chart.lines[line_id];
if matches!(line.notes[id as usize].kind, NoteKind::Drag) {
debug!("reject by drag");
if let (Some((line_id, id)), _, dt, _, posx) = closest {
let can_protect_note = |note: &mut Note| {
let x = &mut note.object.translation.0;
x.set_time(t);
let judge_time = t - note.time;
matches!(note.kind, NoteKind::Drag | NoteKind::Flick)
&& judge_time >= -LIMIT_GOOD
&& judge_time <= LIMIT_BAD
&& (x.now() - posx).abs() <= X_DIFF_MAX // note_dist <= x_diff_max
&& !note.protected
&& !note.fake
};
let lines = &mut chart.lines;
if matches!(lines[line_id].notes[id as usize].kind, NoteKind::Drag) {
// debug!("reject by drag");
continue;
}
if click {
if dt > LIMIT_PERFECT {
let mut any = false;
lines.iter_mut()
.flat_map(|line| line.notes.iter_mut())
.for_each(|note| {
if can_protect_note(note) {
note.protected = true;
any = true;
}
});
if any {
continue;
}
}
// click & hold
let note = &mut line.notes[id as usize];
let note = &mut lines[line_id].notes[id as usize];
let dt = dt.abs();
if matches!(note.kind, NoteKind::Flick) {
continue; // to next loop
}
Expand All @@ -586,13 +616,13 @@ impl Judge {
// prevent extra judgements
if matches!(note.judge, JudgeStatus::NotJudged) {
// keep the note after bad judgement
line.notes[id as usize].judge = JudgeStatus::PreJudge;
note.judge = JudgeStatus::PreJudge;
judgements.push((Judgement::Bad, line_id, id, None));
}
}
} else {
// flick
line.notes[id as usize].judge = JudgeStatus::PreJudge;
lines[line_id].notes[id as usize].judge = JudgeStatus::PreJudge;
if let Some(tracker) = self.trackers.get_mut(&touch.id) {
tracker.flicked = false;
}
Expand Down
1 change: 1 addition & 0 deletions prpr/src/parse/pec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ pub fn parse_pec(source: &str, extra: ChartExtra) -> Result<Chart> {
multiple_hint: false,
fake,
judge: JudgeStatus::NotJudged,
protected: false,
});
if it.next() == Some("#") {
last_note!().speed = it.take_f32()?;
Expand Down
1 change: 1 addition & 0 deletions prpr/src/parse/pgr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ fn parse_notes(r: f32, mut pgr: Vec<PgrNote>, speed: &mut AnimFloat, height: &mu
multiple_hint: false,
fake: false,
judge: JudgeStatus::NotJudged,
protected: false,
})
})
.collect()
Expand Down
1 change: 1 addition & 0 deletions prpr/src/parse/rpe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ async fn parse_notes(
multiple_hint: false,
fake: note.is_fake != 0,
judge: JudgeStatus::NotJudged,
protected: false,
})
}
Ok(notes)
Expand Down