Merge branch 'master' of ssh://hackerspace.pl/informatic/love2d-signage
merge with upstream mastermaster
commit
fb03473d5f
|
@ -7,4 +7,6 @@ return {
|
|||
{'nodes.slideshow', fileName='images/logo.png', displayTime=5},
|
||||
},
|
||||
environment = os.getenv('ENV') or 'prod',
|
||||
renderWidth = 1280,
|
||||
renderHeight = 720,
|
||||
}
|
||||
|
|
2
main.lua
2
main.lua
|
@ -14,7 +14,7 @@ local debugGraph = require('vendor.debugGraph')
|
|||
|
||||
local fpsGraph, memGraph;
|
||||
|
||||
local gameWidth, gameHeight = 1280, 720
|
||||
local gameWidth, gameHeight = config.renderWidth, config.renderHeight
|
||||
local windowWidth, windowHeight = love.window.getDesktopDimensions()
|
||||
windowWidth, windowHeight = windowWidth*.5, windowHeight*.5 --make the window a bit smaller than the screen itself
|
||||
|
||||
|
|
|
@ -10,10 +10,10 @@ function node:render()
|
|||
love.graphics.setColor( 255, 255, 255 )
|
||||
|
||||
love.graphics.setFont(textFont);
|
||||
love.graphics.printf(os.date('%H:%M'), 0, 100, love.graphics.getWidth(), 'center');
|
||||
love.graphics.printf(os.date('%H:%M'), 0, 0.14*love.graphics.getHeight(), love.graphics.getWidth(), 'center');
|
||||
|
||||
love.graphics.setFont(smallFont);
|
||||
love.graphics.printf(os.date('%Y/%m/%d'), 0, 575, love.graphics.getWidth(), 'center');
|
||||
love.graphics.printf(os.date('%Y/%m/%d'), 0, 0.8*love.graphics.getHeight(), love.graphics.getWidth(), 'center');
|
||||
end
|
||||
|
||||
return node
|
||||
|
|
Loading…
Reference in New Issue