Remove offset option
All tested charts do not have an offset. The former offset implementation (which was not working) just cancelled out at charts with a specific bpm value.
This commit is contained in:
parent
8556a4390f
commit
3dc24d58b5
|
@ -39,13 +39,6 @@ impl FromStr for ConfigRange {
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
#[clap(skip = "audio.wav")]
|
#[clap(skip = "audio.wav")]
|
||||||
pub audio_filename: String,
|
pub audio_filename: String,
|
||||||
#[clap(
|
|
||||||
long,
|
|
||||||
default_value = "180",
|
|
||||||
about = "Offset in milliseconds",
|
|
||||||
display_order = 5
|
|
||||||
)]
|
|
||||||
pub offset: i32,
|
|
||||||
#[clap(
|
#[clap(
|
||||||
long = "no-stops",
|
long = "no-stops",
|
||||||
about = "Disable stops",
|
about = "Disable stops",
|
||||||
|
@ -96,9 +89,8 @@ impl fmt::Display for Config {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
write!(
|
write!(
|
||||||
f,
|
f,
|
||||||
"ddr2osu (+{}ms{} shock→{:?} hp{} acc{})",
|
"ddr2osu ({}shock→{:?} hp{} acc{})",
|
||||||
self.offset,
|
if self.stops { "stops " } else { "" },
|
||||||
if self.stops { " stops" } else { "" },
|
|
||||||
self.shock_action,
|
self.shock_action,
|
||||||
self.hp_drain,
|
self.hp_drain,
|
||||||
self.accuracy
|
self.accuracy
|
||||||
|
@ -349,20 +341,6 @@ impl ssq::SSQ {
|
||||||
|
|
||||||
let mut timing_points = Vec::new();
|
let mut timing_points = Vec::new();
|
||||||
|
|
||||||
timing_points.push(beatmap::TimingPoint {
|
|
||||||
time: 0,
|
|
||||||
beat_length: config.offset as f32,
|
|
||||||
meter: 4,
|
|
||||||
sample_set: beatmap::SampleSet::BeatmapDefault,
|
|
||||||
sample_index: 0,
|
|
||||||
volume: 0,
|
|
||||||
uninherited: true,
|
|
||||||
effects: beatmap::TimingPointEffects {
|
|
||||||
kiai_time: false,
|
|
||||||
omit_first_barline: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
for entry in &self.tempo_changes.0 {
|
for entry in &self.tempo_changes.0 {
|
||||||
if config.stops || entry.beat_length != f32::INFINITY {
|
if config.stops || entry.beat_length != f32::INFINITY {
|
||||||
trace!("Converting {:?} to to timing point", entry);
|
trace!("Converting {:?} to to timing point", entry);
|
||||||
|
|
Reference in a new issue