Merge remote-tracking branch 'refs/remotes/origin/main'

Merge ninja commit into my copy
This commit is contained in:
Thibaud 2024-05-28 20:58:52 +02:00
commit f1aebaaaab
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ def main():
offset = timing.offset.total_seconds() * 10e3 offset = timing.offset.total_seconds() * 10e3
print(beatmap.audio_filename) print(beatmap.audio_filename)
timings, amplitudes, freqs = sound_process.process_song(beatmap.audio_filename, offset, bpm) timings, amplitudes, freqs = sound_process.process_song(beatmap.audio_filename, bpm, offset=offset)
beatmap._hit_objects = place.greedy(bpm, offset, timings, amplitudes) beatmap._hit_objects = place.greedy(bpm, offset, timings, amplitudes)
#beatmap._hit_objects = [sl.Slider(sl.Position(0, 0), timedelta(milliseconds=3), timedelta(milliseconds=130), 0, sl.curve.Linear([sl.Position(0, 0), sl.Position(100, 100)], 100), 100, 2, 1, 1, 1, timing.ms_per_beat, [], [],)] #beatmap._hit_objects = [sl.Slider(sl.Position(0, 0), timedelta(milliseconds=3), timedelta(milliseconds=130), 0, sl.curve.Linear([sl.Position(0, 0), sl.Position(100, 100)], 100), 100, 2, 1, 1, 1, timing.ms_per_beat, [], [],)]

View File

@ -425,7 +425,7 @@ def process_song(filename, bpm, offset=0, div_len_factor=1, n_iter_2=-1, thresho
n_iter = n_iter_2 n_iter = n_iter_2
if(n_iter == -1): if(n_iter == -1):
song_len = get_songlen(filename) song_len = get_songlen(filename)
n_iter = int(song_len/div_len)-1 n_iter = int(song_len/div_len)-1/3
filtered_name = f"{filename}_trimmed.wav" filtered_name = f"{filename}_trimmed.wav"
@ -439,7 +439,7 @@ def process_song(filename, bpm, offset=0, div_len_factor=1, n_iter_2=-1, thresho
def main(): def main():
data = process_song("tetris_4.wav", 160, n_iter_2 = 32) data = process_song("tetris_4.wav", 160, n_iter_2 = 64)
#print(data) #print(data)
print("Program finished with return 0") print("Program finished with return 0")