nanahira/taiko-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PraseTja: Fix sub-measure bpm changes

Browse Source
This commit is contained in:
LoveEevee 2018-10-11 19:15:28 +03:00
parent 1fdde6d4a8
commit 31ea8a546c
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
public/src/js/parsetja.js
View File

@ -159,7 +159,7 @@
if(note.endDrumroll){ if(note.endDrumroll){
note.endDrumroll.endTime = ms note.endDrumroll.endTime = ms
} }
var msPerMeasure = 60000 * measure / bpm var msPerMeasure = 60000 * measure / note.bpm
ms += msPerMeasure / currentMeasure.length ms += msPerMeasure / currentMeasure.length
} }
for(var i = 0; i < currentMeasure.length; i++){ for(var i = 0; i < currentMeasure.length; i++){
@ -196,19 +196,36 @@
var line = line.slice(1).toLowerCase() var line = line.slice(1).toLowerCase()
var [name, value] = this.split(line, " ") var [name, value] = this.split(line, " ")
if(!branch || branch && branchType === branchPreference){
switch(name){
case "gogostart":
gogo = true
break
case "gogoend":
gogo = false
break
case "bpmchange":
bpm = parseFloat(value)
break
case "scroll":
scroll = parseFloat(value)
break
case "measure":
var [numerator, denominator] = value.split("/")
measure = numerator / denominator * 4
break
case "delay":
ms += (parseFloat(value) || 0) * 1000
break
case "barlineon":
barLine = true
break
case "barlineoff":
barLine = false
break
}
}
switch(name){ switch(name){
case "gogostart":
gogo = true
break
case "gogoend":
gogo = false
break
case "bpmchange":
bpm = parseFloat(value)
break
case "scroll":
scroll = parseFloat(value)
break
case "branchstart": case "branchstart":
branch = true branch = true
branchType = "" branchType = ""
@ -229,19 +246,6 @@
case "n": case "e": case "m": case "n": case "e": case "m":
branchType = name branchType = name
break break
case "measure":
var [numerator, denominator] = value.split("/")
measure = numerator / denominator * 4
break
case "delay":
ms += (parseFloat(value) || 0) * 1000
break
case "barlineon":
barLine = true
break
case "barlineoff":
barLine = false
break
} }
}else if(!branch || branch && branchType === branchPreference){ }else if(!branch || branch && branchType === branchPreference){