update demo for love 11.x

This commit is contained in:
Andrew Minnich
2018-07-04 18:45:26 -04:00
parent a65aa51267
commit 776e6debd5

View File

@@ -28,23 +28,23 @@ function love.update(dt)
player:update() player:update()
pairDisplayTargetAlpha = player:pressed 'move' and 255 pairDisplayTargetAlpha = player:pressed 'move' and 1
or player:released 'move' and 255 or player:released 'move' and 1
or player:down 'move' and 100 or player:down 'move' and .5
or 0 or 0
if pairDisplayAlpha > pairDisplayTargetAlpha then if pairDisplayAlpha > pairDisplayTargetAlpha then
pairDisplayAlpha = pairDisplayAlpha - 1000 * dt pairDisplayAlpha = pairDisplayAlpha - 4 * dt
end end
if pairDisplayAlpha < pairDisplayTargetAlpha then if pairDisplayAlpha < pairDisplayTargetAlpha then
pairDisplayAlpha = pairDisplayTargetAlpha pairDisplayAlpha = pairDisplayTargetAlpha
end end
buttonDisplayTargetAlpha = player:pressed 'action' and 255 buttonDisplayTargetAlpha = player:pressed 'action' and 1
or player:released 'action' and 255 or player:released 'action' and 1
or player:down 'action' and 100 or player:down 'action' and .5
or 0 or 0
if buttonDisplayAlpha > buttonDisplayTargetAlpha then if buttonDisplayAlpha > buttonDisplayTargetAlpha then
buttonDisplayAlpha = buttonDisplayAlpha - 1000 * dt buttonDisplayAlpha = buttonDisplayAlpha - 4 * dt
end end
if buttonDisplayAlpha < buttonDisplayTargetAlpha then if buttonDisplayAlpha < buttonDisplayTargetAlpha then
buttonDisplayAlpha = buttonDisplayTargetAlpha buttonDisplayAlpha = buttonDisplayTargetAlpha
@@ -66,7 +66,7 @@ end
local pairDisplayRadius = 128 local pairDisplayRadius = 128
function love.draw() function love.draw()
love.graphics.setColor(255, 255, 255) love.graphics.setColor(1, 1, 1)
love.graphics.print('Current active device: ' .. tostring(player:getActiveDevice())) love.graphics.print('Current active device: ' .. tostring(player:getActiveDevice()))
love.graphics.print('Average update time (us): ' .. math.floor(updateTime/updates*1000000), 0, 16) love.graphics.print('Average update time (us): ' .. math.floor(updateTime/updates*1000000), 0, 16)
love.graphics.print('Memory usage (kb): ' .. math.floor(collectgarbage 'count'), 0, 32) love.graphics.print('Memory usage (kb): ' .. math.floor(collectgarbage 'count'), 0, 32)
@@ -74,10 +74,10 @@ function love.draw()
love.graphics.push() love.graphics.push()
love.graphics.translate(400, 300) love.graphics.translate(400, 300)
love.graphics.setColor(50, 50, 50, pairDisplayAlpha) love.graphics.setColor(.25, .25, .25, pairDisplayAlpha)
love.graphics.circle('fill', 0, 0, pairDisplayRadius) love.graphics.circle('fill', 0, 0, pairDisplayRadius)
love.graphics.setColor(255, 255, 255) love.graphics.setColor(1, 1, 1)
love.graphics.circle('line', 0, 0, pairDisplayRadius) love.graphics.circle('line', 0, 0, pairDisplayRadius)
local r = pairDisplayRadius * player.config.deadzone local r = pairDisplayRadius * player.config.deadzone
@@ -87,18 +87,18 @@ function love.draw()
love.graphics.circle('line', 0, 0, r) love.graphics.circle('line', 0, 0, r)
end end
love.graphics.setColor(150, 150, 150) love.graphics.setColor(.5, .5, .5)
local x, y = player:getRaw 'move' local x, y = player:getRaw 'move'
love.graphics.circle('fill', x*pairDisplayRadius, love.graphics.circle('fill', x*pairDisplayRadius,
y*pairDisplayRadius, 4) y*pairDisplayRadius, 4)
love.graphics.setColor(255, 255, 255) love.graphics.setColor(1, 1, 1)
local x, y = player:get 'move' x, y = player:get 'move'
love.graphics.circle('fill', x*pairDisplayRadius, love.graphics.circle('fill', x*pairDisplayRadius,
y*pairDisplayRadius, 4) y*pairDisplayRadius, 4)
love.graphics.setColor(255, 255, 255) love.graphics.setColor(1, 1, 1)
love.graphics.rectangle('line', -50, 150, 100, 100) love.graphics.rectangle('line', -50, 150, 100, 100)
love.graphics.setColor(255, 255, 255, buttonDisplayAlpha) love.graphics.setColor(1, 1, 1, buttonDisplayAlpha)
love.graphics.rectangle('fill', -50, 150, 100, 100) love.graphics.rectangle('fill', -50, 150, 100, 100)
love.graphics.pop() love.graphics.pop()