Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2025-02-17 19:09:32 +01:00
Code Releases Wiki Activity

converters.py: Account for GOGOTIME events

Browse Source 
Also add in cases for barline and other events
This commit is contained in:
Viv 2023-06-02 16:33:46 -04:00
parent dcc37ff0dd
commit ec6bf1db68
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tja2fumen/converters.py
View File

@ -63,9 +63,9 @@ def preprocessTJAMeasures(tja):
combined.append(notes.pop(0)) combined.append(notes.pop(0))
# Step 2: Split measure into submeasure # Step 2: Split measure into submeasure
measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'subdivisions': len(measure['data']), measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo,
'pos_start': 0, 'pos_end': 0, 'time_sig': measure['length'], 'subdivisions': len(measure['data']), 'pos_start': 0, 'pos_end': 0,
'data': [], 'properties': measure['properties']} 'time_sig': measure['length'], 'data': [], 'properties': measure['properties']}
for data in combined: for data in combined:
if data['type'] == 'note': if data['type'] == 'note':
measure_cur['data'].append(data) measure_cur['data'].append(data)
@ -78,15 +78,19 @@ def preprocessTJAMeasures(tja):
else: else:
measure_cur['pos_end'] = data['pos'] measure_cur['pos_end'] = data['pos']
measuresCorrected.append(measure_cur) measuresCorrected.append(measure_cur)
measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'subdivisions': len(measure['data']), measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'gogo': currentGogo,
'pos_start': data['pos'], 'pos_end': 0, 'time_sig': measure['length'], 'subdivisions': len(measure['data']), 'pos_start': data['pos'], 'pos_end': 0,
'data': [], 'properties': measure['properties']} 'time_sig': measure['length'], 'data': [], 'properties': measure['properties']}
elif data['type'] == 'scroll': elif data['type'] == 'scroll':
currentScroll = data['value'] currentScroll = data['value']
measure_cur['scroll'] = currentScroll measure_cur['scroll'] = currentScroll
# 'else' non-bpm/scroll events elif data['type'] == 'gogo':
currentGogo = bool(data['value'])
measure_cur['gogo'] = currentGogo
elif data['type'] == 'barline':
pass
else: else:
measure_cur['data'].append(data) print(f"Unexpected event type: {data['type']}")
measure_cur['pos_end'] = len(measure['data']) measure_cur['pos_end'] = len(measure['data'])
measuresCorrected.append(measure_cur) measuresCorrected.append(measure_cur)
@ -145,6 +149,7 @@ def convertTJAToFumen(fumen, tja):
note_counter += 1 note_counter += 1
measureFumen[currentBranch]['length'] = note_counter measureFumen[currentBranch]['length'] = note_counter
measureFumen[currentBranch]['speed'] = measureTJA['scroll'] measureFumen[currentBranch]['speed'] = measureTJA['scroll']
measureFumen['gogo'] = measureTJA['gogo']
measureFumen['bpm'] = measureTJA['bpm'] measureFumen['bpm'] = measureTJA['bpm']
# Append the measure to the tja's list of measures # Append the measure to the tja's list of measures