Skip to content

Commit 7141ade

Browse files
committed
updated opacity range to 0.0..=255.0
1 parent 3688e62 commit 7141ade

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/loader/official.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ impl Loader for OfficialLoader {
179179
for event in line.opacity_events.iter() {
180180
parent.spawn(LineEventBundle::new(LineEvent {
181181
kind: LineEventKind::Opacity,
182-
start: event.start,
183-
end: event.end,
182+
start: event.start * 255.0,
183+
end: event.end * 255.0,
184184
start_beat: t(event.start_time),
185185
end_beat: t(event.end_time),
186186
}));

src/serialzation.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ impl Default for LineWrapper {
6363
},
6464
LineEvent {
6565
kind: LineEventKind::Opacity,
66-
start: 1.0,
67-
end: 1.0,
66+
start: 255.0,
67+
end: 255.0,
6868
start_beat: Beat::ZERO,
6969
end_beat: Beat::ONE,
7070
},

src/tab/game/core.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn compute_line_system(
126126
if keyboard.pressed(KeyCode::KeyT) {
127127
opacity.0 = 1.0;
128128
} else {
129-
opacity.0 = value;
129+
opacity.0 = value / 255.0;
130130
}
131131
}
132132
LineEventKind::Speed => {}

src/tab/inspector.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use bevy::prelude::*;
22
use egui::Ui;
33
use num::Rational32;
44

5-
use crate::chart::event::LineEvent;
5+
use crate::chart::event::{LineEvent, LineEventKind};
66
use crate::{
77
chart::{
88
beat::Beat,
@@ -77,11 +77,15 @@ fn single_event_inspector(ui: &mut Ui, event: &mut LineEvent, translator: &Trans
7777
ui.end_row();
7878

7979
ui.label(translator.tr("tab.inspector.single_event.start_value"));
80-
ui.add(egui::DragValue::new(&mut event.start));
80+
let range = match event.kind {
81+
LineEventKind::Opacity => 0.0..=255.0,
82+
_ => f32::MIN..=f32::MAX,
83+
};
84+
ui.add(egui::DragValue::new(&mut event.start).clamp_range(range.clone()).speed(1.0));
8185
ui.end_row();
8286

8387
ui.label(translator.tr("tab.inspector.single_event.end_value"));
84-
ui.add(egui::DragValue::new(&mut event.end));
88+
ui.add(egui::DragValue::new(&mut event.end).clamp_range(range.clone()).speed(1.0));
8589
ui.end_row();
8690
});
8791
}

0 commit comments

Comments
 (0)