Taiko_Stuff/tja2fumen
1
0
Fork 0
mirror of synced 2025-02-03 13:13:26 +01:00
Code Releases Wiki Activity

converters.py: Handle #SCROLL events

Browse Source
This commit is contained in:
Viv 2023-06-02 16:33:45 -04:00
parent ae84137478
commit fdeefc2499
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tja2fumen/converters.py
View File

@ -41,6 +41,7 @@ def preprocessTJAMeasures(tja):
measuresCorrected = [] measuresCorrected = []
currentBPM = 0 currentBPM = 0
currentScroll = 1.0
currentGogo = False currentGogo = False
currentHidden = False currentHidden = False
@ -64,7 +65,7 @@ def preprocessTJAMeasures(tja):
# Step 2: Split measure into submeasure # Step 2: Split measure into submeasure
submeasures = [] submeasures = []
measure_cur = {'bpm': currentBPM, 'pos_start': 0, 'data': []} measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'pos_start': 0, 'data': []}
for data in combined: for data in combined:
if data['type'] == 'bpm': if data['type'] == 'bpm':
currentBPM = float(data['value']) currentBPM = float(data['value'])
@ -75,7 +76,11 @@ def preprocessTJAMeasures(tja):
else: else:
measure_cur['pos_end'] = data['pos'] measure_cur['pos_end'] = data['pos']
submeasures.append(measure_cur) submeasures.append(measure_cur)
measure_cur = {'bpm': currentBPM, 'pos_start': data['pos'], 'data': []} measure_cur = {'bpm': currentBPM, 'scroll': currentScroll, 'pos_start': data['pos'], 'data': []}
elif data['type'] == 'scroll':
currentScroll = data['value']
measure_cur['scroll'] = currentScroll
# 'else' == Note data, and non-bpm/scroll events
else: else:
measure_cur['data'].append(data) measure_cur['data'].append(data)
measure_cur['pos_end'] = len(measure['data']) measure_cur['pos_end'] = len(measure['data'])
@ -85,6 +90,7 @@ def preprocessTJAMeasures(tja):
for submeasure in submeasures: for submeasure in submeasures:
measuresCorrected.append({ measuresCorrected.append({
'bpm': submeasure['bpm'], 'bpm': submeasure['bpm'],
'scroll': submeasure['scroll'],
'subdivisions': len(measure['data']), 'subdivisions': len(measure['data']),
'pos_start': submeasure['pos_start'], 'pos_start': submeasure['pos_start'],
'pos_end': submeasure['pos_end'], 'pos_end': submeasure['pos_end'],
@ -147,6 +153,7 @@ def convertTJAToFumen(fumen, tja):
measureFumen[currentBranch][note_counter] = note measureFumen[currentBranch][note_counter] = note
note_counter += 1 note_counter += 1
measureFumen[currentBranch]['length'] = note_counter measureFumen[currentBranch]['length'] = note_counter
measureFumen[currentBranch]['speed'] = measureTJA['scroll']
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