juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 07:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from LoveEevee/songsel-selectable-assets-cleanup

Browse Source 
Hide barlines when they should be hidden
This commit is contained in:
Bui 2018-10-27 22:07:55 +01:00 committed by GitHub
commit 5fcdca89e5
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,6 @@
var branchPreference = "m" var branchPreference = "m"
var currentMeasure = [] var currentMeasure = []
var firstMeasure = true
var firstNote = true var firstNote = true
var circles = [] var circles = []
var circleID = 0 var circleID = 0
@ -143,17 +142,6 @@
originalMS: ms, originalMS: ms,
speed: speed speed: speed
}) })
if(firstMeasure){
firstMeasure = false
var msPerMeasure = 60000 * measure / bpm
for(var measureMs = ms - msPerMeasure; measureMs > 0; measureMs -= msPerMeasure){
this.measures.push({
ms: measureMs,
originalMS: ms,
speed: speed
})
}
}
} }
if(currentMeasure.length){ if(currentMeasure.length){
for(var i = 0; i < currentMeasure.length; i++){ for(var i = 0; i < currentMeasure.length; i++){

6
public/src/js/songselect.js
View File

@ -243,8 +243,8 @@ class SongSelect{
this.startP2() this.startP2()
pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this)) pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this))
pageEvents.add(window, "mousemove", this.mouseMove.bind(this)) pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this))
pageEvents.add(window, ["mousedown", "touchstart"], this.mouseDown.bind(this)) pageEvents.add(loader.screen, ["mousedown", "touchstart"], this.mouseDown.bind(this))
if(touchEnabled && fullScreenSupported){ if(touchEnabled && fullScreenSupported){
this.touchFullBtn = document.getElementById("touch-full-btn") this.touchFullBtn = document.getElementById("touch-full-btn")
this.touchFullBtn.style.display = "block" this.touchFullBtn.style.display = "block"
@ -1459,7 +1459,7 @@ class SongSelect{
this.redrawRunning = false this.redrawRunning = false
this.endPreview() this.endPreview()
pageEvents.keyRemove(this, "all") pageEvents.keyRemove(this, "all")
pageEvents.remove(window, ["mousemove", "mousedown", "touchstart"]) pageEvents.remove(loader.screen, ["mousemove", "mousedown", "touchstart"])
if(this.touchEnabled && fullScreenSupported){ if(this.touchEnabled && fullScreenSupported){
pageEvents.remove(this.touchFullBtn, "click") pageEvents.remove(this.touchFullBtn, "click")
delete this.touchFullBtn delete this.touchFullBtn