Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2024-11-27 22:40:49 +01:00
Code Releases Wiki Activity

converters.py: Remove the need for measureDurationPrev

Browse Source
This commit is contained in:
Viv 2023-07-08 19:38:29 -04:00
parent ab7708e740
commit 5664c7c8d0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tja2fumen/converters.py
View File

@ -11,6 +11,7 @@ default_note = {'type': '', 'pos': 0.0, 'item': 0, 'padding': 0.0,
default_branch = {'length': 0, 'padding': 0, 'speed': 1.0} default_branch = {'length': 0, 'padding': 0, 'speed': 1.0}
default_measure = { default_measure = {
'bpm': 0.0, 'bpm': 0.0,
'duration': 0.0,
'fumenOffset': 0.0, 'fumenOffset': 0.0,
'gogo': False, 'gogo': False,
'barline': True, 'barline': True,
@ -131,7 +132,6 @@ def convertTJAToFumen(tja):
total_notes = 0 total_notes = 0
total_notes_branch = 0 total_notes_branch = 0
note_counter_branch = 0 note_counter_branch = 0
measureDurationPrev = 0
currentDrumroll = None currentDrumroll = None
courseBalloons = tja['metadata']['balloon'].copy() courseBalloons = tja['metadata']['balloon'].copy()
for idx_m, measureTJA in enumerate(branch): for idx_m, measureTJA in enumerate(branch):
@ -166,6 +166,7 @@ def convertTJAToFumen(tja):
measureTJANext = branch[idx_m + 1] measureTJANext = branch[idx_m + 1]
if measureTJA['bpm'] != measureTJANext['bpm']: if measureTJA['bpm'] != measureTJANext['bpm']:
measureDuration -= (4 * 60_000 * ((1 / measureTJANext['bpm']) - (1 / measureTJA['bpm']))) measureDuration -= (4 * 60_000 * ((1 / measureTJANext['bpm']) - (1 / measureTJA['bpm'])))
measureFumen['duration'] = measureDuration
# Compute the millisecond offset for each measure # Compute the millisecond offset for each measure
if idx_m == 0: if idx_m == 0:
@ -173,9 +174,9 @@ def convertTJAToFumen(tja):
tjaConverted['measures'][idx_m]['fumenOffset'] = tjaOffset - measureDurationFullMeasure tjaConverted['measures'][idx_m]['fumenOffset'] = tjaOffset - measureDurationFullMeasure
else: else:
# Use the previous measure's offset plus the previous duration to compute the current measure's offset # Use the previous measure's offset plus the previous duration to compute the current measure's offset
measureOffsetPrev = tjaConverted['measures'][idx_m-1]['fumenOffset'] measureFumenPrev = tjaConverted['measures'][idx_m-1]
measureFumen['fumenOffset'] = measureOffsetPrev + measureDurationPrev + measureTJA['delay'] measureFumen['fumenOffset'] = (measureFumenPrev['fumenOffset'] + measureFumenPrev['duration']
measureDurationPrev = measureDuration + measureTJA['delay'])
# Best guess at what 'barline' status means for each measure: # Best guess at what 'barline' status means for each measure:
# - 'True' means the measure lands on a barline (i.e. most measures), and thus barline should be shown # - 'True' means the measure lands on a barline (i.e. most measures), and thus barline should be shown