add bpm slider
This commit is contained in:
parent
24647a50a6
commit
2237128a84
2 changed files with 17 additions and 1 deletions
|
@ -37,7 +37,7 @@ function self.update(dt)
|
||||||
local mx, my = love.mouse.getPosition()
|
local mx, my = love.mouse.getPosition()
|
||||||
|
|
||||||
if not (love.mouse.isDown(1) and mx > x and mx < x + w and my > y and my < y + h) then
|
if not (love.mouse.isDown(1) and mx > x and mx < x + w and my > y and my < y + h) then
|
||||||
timer = (timer + dt) % 2
|
timer = (timer + dt * (slider.kvalue('bpm')/120)) % 2
|
||||||
else
|
else
|
||||||
timer = mix(timer, (mx - x) / w, dt * 14)
|
timer = mix(timer, (mx - x) / w, dt * 14)
|
||||||
end
|
end
|
||||||
|
|
16
slider.lua
16
slider.lua
|
@ -29,6 +29,9 @@ local function insertSlider(tab, f)
|
||||||
f.oldvalue = (self.kget(f.name) or {oldvalue = f.value}).oldvalue
|
f.oldvalue = (self.kget(f.name) or {oldvalue = f.value}).oldvalue
|
||||||
f.spintimer = (self.kget(f.name) or {spintimer = 0}).spintimer
|
f.spintimer = (self.kget(f.name) or {spintimer = 0}).spintimer
|
||||||
f.spin = (self.kget(f.name) or {spin = 0}).spin
|
f.spin = (self.kget(f.name) or {spin = 0}).spin
|
||||||
|
if f.snap then
|
||||||
|
f.value = math.floor(f.value / f.snap) * f.snap
|
||||||
|
end
|
||||||
return table.insert(tab, f)
|
return table.insert(tab, f)
|
||||||
end
|
end
|
||||||
function self.createSliders()
|
function self.createSliders()
|
||||||
|
@ -47,6 +50,19 @@ function self.createSliders()
|
||||||
displayname = 'Mix'
|
displayname = 'Mix'
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
if mode == 1 or mode == 2 then -- bpm slider
|
||||||
|
insertSlider(s, {
|
||||||
|
x = outerpadding,
|
||||||
|
y = love.graphics.getHeight() - outerpadding - fontHeight * 3 - padding,
|
||||||
|
width = dropdownWidth,
|
||||||
|
min = 80,
|
||||||
|
max = 220,
|
||||||
|
default = 120,
|
||||||
|
name = 'bpm',
|
||||||
|
displayname = 'BPM',
|
||||||
|
snap = 1,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
local ease1 = ease.eases[dropdown.kselected('ease1')]
|
local ease1 = ease.eases[dropdown.kselected('ease1')]
|
||||||
local ease2 = ease.eases[dropdown.kselected('ease2')]
|
local ease2 = ease.eases[dropdown.kselected('ease2')]
|
||||||
|
|
Loading…
Reference in a new issue