unhardcode modes
This commit is contained in:
parent
263259c2f5
commit
c44579b508
3 changed files with 10 additions and 4 deletions
|
@ -46,7 +46,7 @@ end
|
||||||
function self.render()
|
function self.render()
|
||||||
local sw, sh = love.graphics.getDimensions()
|
local sw, sh = love.graphics.getDimensions()
|
||||||
|
|
||||||
if mode == 1 or mode == 2 then
|
if mode == modes.preview or mode == modes.mix then
|
||||||
local csize = 10 -- preview point size
|
local csize = 10 -- preview point size
|
||||||
local size = math.min((sw - outerpadding) - ((dropdown.kget('ease2') or dropdown.kget('ease1')).x + dropdownWidth + padding), sh - outerpadding * 2 - padding * 3 - csize)
|
local size = math.min((sw - outerpadding) - ((dropdown.kget('ease2') or dropdown.kget('ease1')).x + dropdownWidth + padding), sh - outerpadding * 2 - padding * 3 - csize)
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ function self.render()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- mixease point
|
-- mixease point
|
||||||
if mode == 2 and slider.kget('mix') then
|
if mode == modes.mix and slider.kget('mix') then
|
||||||
love.graphics.setColor(1, 1, 1, 0.2 + self.touchtimer * 0.6)
|
love.graphics.setColor(1, 1, 1, 0.2 + self.touchtimer * 0.6)
|
||||||
love.graphics.line(x + margin + slider.kvalue('mix') * w, y, x + margin + slider.kvalue('mix') * w, y + h)
|
love.graphics.line(x + margin + slider.kvalue('mix') * w, y, x + margin + slider.kvalue('mix') * w, y + h)
|
||||||
end
|
end
|
||||||
|
|
6
main.lua
6
main.lua
|
@ -12,6 +12,12 @@ slider = require 'slider'
|
||||||
dropdown = require 'dropdown'
|
dropdown = require 'dropdown'
|
||||||
graph = require 'graph'
|
graph = require 'graph'
|
||||||
|
|
||||||
|
modes = {
|
||||||
|
preview = 1,
|
||||||
|
mix = 2,
|
||||||
|
create = 3
|
||||||
|
}
|
||||||
|
|
||||||
function createUI()
|
function createUI()
|
||||||
dropdown.createDropdowns()
|
dropdown.createDropdowns()
|
||||||
slider.createSliders()
|
slider.createSliders()
|
||||||
|
|
|
@ -38,7 +38,7 @@ function self.createSliders()
|
||||||
local s = {}
|
local s = {}
|
||||||
sliderId = 0
|
sliderId = 0
|
||||||
|
|
||||||
if mode == 2 then -- mix eases
|
if mode == modes.mix then -- mix eases
|
||||||
insertSlider(s, {
|
insertSlider(s, {
|
||||||
x = outerpadding,
|
x = outerpadding,
|
||||||
y = outerpadding + fontHeight * 2.5 + padding,
|
y = outerpadding + fontHeight * 2.5 + padding,
|
||||||
|
@ -50,7 +50,7 @@ function self.createSliders()
|
||||||
displayname = 'Mix'
|
displayname = 'Mix'
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
if mode == 1 or mode == 2 then -- bpm slider
|
if mode == modes.preview or mode == modes.mix then -- bpm slider
|
||||||
insertSlider(s, {
|
insertSlider(s, {
|
||||||
x = outerpadding,
|
x = outerpadding,
|
||||||
y = love.graphics.getHeight() - outerpadding - fontHeight * 3 - padding,
|
y = love.graphics.getHeight() - outerpadding - fontHeight * 3 - padding,
|
||||||
|
|
Loading…
Reference in a new issue