mirror of
https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git
synced 2024-11-14 23:11:51 +08:00
Add key shortcut for debug, add starting measure and restart
This commit is contained in:
parent
04473acb74
commit
122d3c06c8
@ -2,8 +2,8 @@
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 180px;
|
||||
height: 160px;
|
||||
width: 250px;
|
||||
height: 220px;
|
||||
background: #fff;
|
||||
border: 1px solid #333;
|
||||
color: #000;
|
||||
@ -49,7 +49,7 @@
|
||||
display: flex;
|
||||
width: 100%;
|
||||
height: 30px;
|
||||
margin: 5px 0;
|
||||
margin: 5px 0 15px 0;
|
||||
}
|
||||
#debug .input-slider>input{
|
||||
width: 70%;
|
||||
@ -75,3 +75,12 @@
|
||||
opacity: 1;
|
||||
background: #333;
|
||||
}
|
||||
|
||||
#debug label{
|
||||
display: block;
|
||||
margin: 15px 0;
|
||||
}
|
||||
|
||||
#debug input[type="checkbox"]{
|
||||
margin-right: 1em;
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ class Controller{
|
||||
syncWith.startDate = this.game.startDate
|
||||
this.syncWith = syncWith
|
||||
}
|
||||
if(this.multiplayer !== 2){
|
||||
if(!this.multiplayer){
|
||||
debugObj.controller = this
|
||||
if(debugObj.debug){
|
||||
debugObj.debug.updateStatus()
|
||||
@ -224,7 +224,7 @@ class Controller{
|
||||
pageEvents.remove(this.songSelBtn, ["click", "touchend"])
|
||||
delete this.songSelBtn
|
||||
|
||||
if(this.multiplayer !== 2){
|
||||
if(!this.multiplayer){
|
||||
debugObj.controller = null
|
||||
if(debugObj.debug){
|
||||
debugObj.debug.updateStatus()
|
||||
|
@ -8,6 +8,8 @@ class Debug{
|
||||
this.titleDiv = this.debugDiv.getElementsByClassName("title")[0]
|
||||
this.minimiseDiv = this.debugDiv.getElementsByClassName("minimise")[0]
|
||||
this.offsetDiv = this.debugDiv.getElementsByClassName("offset")[0]
|
||||
this.measureNumDiv = this.debugDiv.getElementsByClassName("measure-num")[0]
|
||||
this.restartCheckbox = this.debugDiv.getElementsByClassName("change-restart")[0]
|
||||
|
||||
this.moving = false
|
||||
pageEvents.add(window, ["mousedown", "mouseup", "blur"], this.stopMove.bind(this))
|
||||
@ -15,9 +17,13 @@ class Debug{
|
||||
pageEvents.add(this.titleDiv, "mousedown", this.startMove.bind(this))
|
||||
pageEvents.add(this.minimiseDiv, "click", this.minimise.bind(this))
|
||||
|
||||
this.offsetSlider = new InputSlider(this.offsetDiv)
|
||||
this.offsetSlider = new InputSlider(this.offsetDiv, -60, 60, 3)
|
||||
this.offsetSlider.onchange(this.offsetChange.bind(this))
|
||||
|
||||
this.measureNumSlider = new InputSlider(this.measureNumDiv, 0, 1000, 0)
|
||||
this.measureNumSlider.onchange(this.measureNumChange.bind(this))
|
||||
this.measureNumSlider.set(0)
|
||||
|
||||
this.moveTo(100, 100)
|
||||
this.restore()
|
||||
this.updateStatus()
|
||||
@ -75,17 +81,37 @@ class Debug{
|
||||
var selectedSong = this.controller.selectedSong
|
||||
this.defaultOffset = selectedSong.offset
|
||||
if(this.songFolder === selectedSong.folder){
|
||||
this.offsetChange(this.offsetSlider.get())
|
||||
this.offsetChange(this.offsetSlider.get(), true)
|
||||
}else{
|
||||
this.songFolder = selectedSong.folder
|
||||
this.offsetSlider.set(this.defaultOffset)
|
||||
}
|
||||
|
||||
var measures = this.controller.parsedSongData.measures
|
||||
this.measureNumSlider.setMinMax(0, measures.length - 1)
|
||||
if(this.measureNum && measures.length > this.measureNum){
|
||||
var measureMS = measures[this.measureNum].ms
|
||||
var game = this.controller.game
|
||||
game.started = true
|
||||
var timestamp = +new Date
|
||||
var currentDate = timestamp - measureMS
|
||||
game.startDate = currentDate
|
||||
game.sndTime = timestamp - snd.buffer.getTime() * 1000
|
||||
var circles = game.songData.circles
|
||||
for(var i in circles){
|
||||
if(circles[i].ms < measureMS){
|
||||
game.currentCircle = i
|
||||
}else{
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(this.controller && !debugObj.controller){
|
||||
this.controller = null
|
||||
}
|
||||
}
|
||||
offsetChange(value){
|
||||
offsetChange(value, noRestart){
|
||||
if(this.controller){
|
||||
var offset = (this.defaultOffset - value) * 1000
|
||||
var songData = this.controller.parsedSongData
|
||||
@ -96,6 +122,15 @@ class Debug{
|
||||
songData.measures.forEach(measure => {
|
||||
measure.ms = measure.originalMS + offset
|
||||
})
|
||||
if(this.restartCheckbox.checked, !noRestart){
|
||||
this.controller.restartSong()
|
||||
}
|
||||
}
|
||||
}
|
||||
measureNumChange(value){
|
||||
this.measureNum = value
|
||||
if(this.controller && this.restartCheckbox.checked){
|
||||
this.controller.restartSong()
|
||||
}
|
||||
}
|
||||
clean(){
|
||||
@ -104,7 +139,6 @@ class Debug{
|
||||
pageEvents.remove(window, ["mousedown", "mouseup", "mousemove", "blur"])
|
||||
pageEvents.remove(this.title, "mousedown")
|
||||
|
||||
delete this.debugDiv
|
||||
delete this.titleDiv
|
||||
delete this.minimiseDiv
|
||||
delete this.controller
|
||||
@ -112,10 +146,17 @@ class Debug{
|
||||
debugObj.state = "closed"
|
||||
debugObj.debug = null
|
||||
document.body.removeChild(this.debugDiv)
|
||||
|
||||
delete this.debugDiv
|
||||
}
|
||||
}
|
||||
class InputSlider{
|
||||
constructor(sliderDiv){
|
||||
constructor(sliderDiv, min, max, fixedPoint){
|
||||
this.fixedPoint = fixedPoint
|
||||
this.mul = Math.pow(10, fixedPoint)
|
||||
this.min = min * this.mul
|
||||
this.max = max * this.mul
|
||||
|
||||
this.input = sliderDiv.getElementsByTagName("input")[0]
|
||||
this.reset = sliderDiv.getElementsByClassName("reset")[0]
|
||||
this.plus = sliderDiv.getElementsByClassName("plus")[0]
|
||||
@ -128,6 +169,7 @@ class InputSlider{
|
||||
pageEvents.add(this.minus, "click", this.subtract.bind(this))
|
||||
pageEvents.add(this.reset, "click", this.resetValue.bind(this))
|
||||
pageEvents.add(this.input, "change", this.manualSet.bind(this))
|
||||
pageEvents.add(this.input, "keydown", this.captureKeys.bind(this))
|
||||
}
|
||||
update(noCallback, force){
|
||||
var oldValue = this.input.value
|
||||
@ -135,37 +177,42 @@ class InputSlider{
|
||||
this.input.value = ""
|
||||
this.input.readOnly = true
|
||||
}else{
|
||||
if(this.value > 60000){
|
||||
this.value = 60000
|
||||
if(this.value > this.max){
|
||||
this.value = this.max
|
||||
}
|
||||
if(this.value < -60000){
|
||||
this.value = -60000
|
||||
if(this.value < this.min){
|
||||
this.value = this.min
|
||||
}
|
||||
this.input.value = this.get().toFixed(3)
|
||||
this.input.value = this.get().toFixed(this.fixedPoint)
|
||||
this.input.readOnly = false
|
||||
}
|
||||
if(force || !noCallback && oldValue !== this.input.value){
|
||||
this.callbacks.forEach(callback => {
|
||||
callback(this.input.value)
|
||||
callback(this.get())
|
||||
})
|
||||
}
|
||||
}
|
||||
set(number){
|
||||
this.value = Math.floor(number * 1000)
|
||||
this.value = Math.floor(number * this.mul)
|
||||
this.defaultValue = this.value
|
||||
this.update(true)
|
||||
}
|
||||
setMinMax(min, max){
|
||||
this.min = min
|
||||
this.max = max
|
||||
this.update()
|
||||
}
|
||||
get(){
|
||||
if(this.value === null){
|
||||
return null
|
||||
}else{
|
||||
return Math.floor(this.value) / 1000
|
||||
return Math.floor(this.value) / this.mul
|
||||
}
|
||||
}
|
||||
add(event){
|
||||
if(this.value !== null){
|
||||
var newValue = this.value + this.eventNumber(event)
|
||||
if(newValue <= 60000){
|
||||
if(newValue <= this.max){
|
||||
this.value = newValue
|
||||
this.update()
|
||||
}
|
||||
@ -174,7 +221,7 @@ class InputSlider{
|
||||
subtract(event){
|
||||
if(this.value !== null){
|
||||
var newValue = this.value - this.eventNumber(event)
|
||||
if(newValue >= -60000){
|
||||
if(newValue >= this.min){
|
||||
this.value = newValue
|
||||
this.update()
|
||||
}
|
||||
@ -191,17 +238,20 @@ class InputSlider{
|
||||
this.callbacks.push(callback)
|
||||
}
|
||||
manualSet(){
|
||||
var number = parseFloat(this.input.value)
|
||||
if(Number.isFinite(number) && -60 <= number && number <= 60){
|
||||
this.value = number * 1000
|
||||
var number = parseFloat(this.input.value) * this.mul
|
||||
if(Number.isFinite(number) && this.min <= number && number <= this.max){
|
||||
this.value = number
|
||||
}
|
||||
this.update(false, true)
|
||||
}
|
||||
captureKeys(event){
|
||||
event.stopPropagation()
|
||||
}
|
||||
clean(){
|
||||
pageEvents.remove(this.plus, "click")
|
||||
pageEvents.remove(this.minus, "click")
|
||||
pageEvents.remove(this.reset, "click")
|
||||
pageEvents.remove(this.input, "change")
|
||||
pageEvents.remove(this.input, ["change", "keydown"])
|
||||
|
||||
delete this.input
|
||||
delete this.reset
|
||||
|
@ -84,6 +84,17 @@ pageEvents.add(versionDiv, ["click", "touchend"], () => {
|
||||
})
|
||||
resizeRoot()
|
||||
setInterval(resizeRoot, 100)
|
||||
pageEvents.keyAdd(debugObj, 186, "down", event => {
|
||||
if(event.ctrlKey && event.shiftKey && !event.altKey){
|
||||
if(debugObj.state === "open"){
|
||||
debugObj.debug.minimise()
|
||||
}else if(debugObj.state === "minimised"){
|
||||
debugObj.debug.restore()
|
||||
}else{
|
||||
debugObj.debug = new Debug()
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
var loader = new Loader(() => {
|
||||
new Titlescreen()
|
||||
|
@ -1,8 +1,13 @@
|
||||
<div class="title stroke-sub" alt="Debug">Debug</div>
|
||||
<div class="minimise"></div>
|
||||
<div class="content">
|
||||
Offset:<br>
|
||||
<div>Song offset:</div>
|
||||
<div class="offset input-slider">
|
||||
<span class="reset">x</span><input type="text" value="" readonly><span class="plus">+</span><span class="minus">-</span>
|
||||
<span class="reset">x</span><input type="text" value="" readonly><span class="minus">-</span><span class="plus">+</span>
|
||||
</div>
|
||||
<div>Starting measure:</div>
|
||||
<div class="measure-num input-slider">
|
||||
<span class="reset">x</span><input type="text" value="" readonly><span class="minus">-</span><span class="plus">+</span>
|
||||
</div>
|
||||
<label><input class="change-restart" type="checkbox">Restart on change</label>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user