Skip to content

fix: note scale #601

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 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

fix: note scale #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions prpr/src/core/note.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ impl Note {
None
} {
self.init_ctrl_obj(ctrl_obj, line_height);
res.with_model(parent_tr * self.now_transform(res, ctrl_obj, 0., 0.), |res| {
res.with_model(parent_tr * self.now_transform(res, ctrl_obj, 0., 0., false), |res| {
res.emit_at_origin(parent_rot + if self.above { 0. } else { 180. }, color)
});
}
Expand All @@ -166,18 +166,17 @@ impl Note {
ctrl_obj.set_height((self.height - line_height + self.object.translation.1.now() / self.speed) * RPE_HEIGHT / 2.);
}

pub fn now_transform(&self, res: &Resource, ctrl_obj: &CtrlObject, base: f32, incline_sin: f32) -> Matrix {
pub fn now_transform(&self, res: &Resource, ctrl_obj: &CtrlObject, base: f32, incline_sin: f32, can_scale_y: bool) -> Matrix {
let incline_val = 1. - incline_sin * (base * res.aspect_ratio + self.object.translation.1.now()) * RPE_HEIGHT / 2. / 360.;
let mut tr = self.object.now_translation(res);
tr.x *= incline_val * ctrl_obj.pos.now_opt().unwrap_or(1.);
tr.y += base;
let mut scale = self.object.scale.now_with_def(1.0, 1.0);
scale.x *= ctrl_obj.size.now_opt().unwrap_or(1.0);
if res.info.note_uniform_scale {
scale.y *= ctrl_obj.size.now_opt().unwrap_or(1.0);
} else {
if !res.info.note_uniform_scale || !can_scale_y {
scale.y = 1.0;
};
scale.y *= ctrl_obj.size.now_opt().unwrap_or(1.0);
self.object.now_rotation().append_nonuniform_scaling(&scale).append_translation(&tr)
}

Expand Down Expand Up @@ -241,7 +240,7 @@ impl Note {
if !config.draw_below {
color.a *= (self.time - res.time).min(0.) / FADEOUT_TIME + 1.;
}
res.with_model(self.now_transform(res, ctrl_obj, base, config.incline_sin), |res| {
res.with_model(self.now_transform(res, ctrl_obj, base, config.incline_sin, true), |res| {
draw_center(res, tex, order, scale, color);
});
};
Expand All @@ -250,7 +249,7 @@ impl Note {
draw(res, *style.click);
}
NoteKind::Hold { end_time, end_height } => {
res.with_model(self.now_transform(res, ctrl_obj, 0., 0.), |res| {
res.with_model(self.now_transform(res, ctrl_obj, 0., 0., false), |res| {
let style = if res.config.double_hint && self.multiple_hint {
&res.res_pack.note_style_mh
} else {
Expand Down
1 change: 1 addition & 0 deletions prpr/src/judge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ impl Judge {
&line.ctrl_obj.borrow_mut(),
(note.height - line.height.now()) / res.aspect_ratio * note.speed,
incline_sin,
true
);
mat
},
Expand Down
Loading