summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Dobrowolski <admin@tastycode.pl>2017-01-08 01:11:19 +0100
committerPiotr Dobrowolski <admin@tastycode.pl>2017-01-08 01:11:19 +0100
commitecb46842ae699f189580e2c12db548811549575f (patch)
tree634575b0a71e1f5eb70b47290cda894949805165
parent590af22cd8a4c696924cf33536ae0611be04728c (diff)
downloadlove2d-signage-ecb46842ae699f189580e2c12db548811549575f.tar.gz
love2d-signage-ecb46842ae699f189580e2c12db548811549575f.tar.bz2
love2d-signage-ecb46842ae699f189580e2c12db548811549575f.zip
Add weather and time screen
-rw-r--r--fonts/Lato-Light.ttfbin0 -> 644556 bytes
-rw-r--r--fonts/Lato-Thin.ttfbin0 -> 627220 bytes
-rw-r--r--fonts/weathericons-regular-webfont.ttfbin0 -> 99564 bytes
-rw-r--r--main.lua54
-rw-r--r--screens/screen1.lua20
-rw-r--r--screens/time.lua21
-rw-r--r--screens/weather.lua55
-rw-r--r--screens/weather_thread.lua18
-rw-r--r--vendor/json.lua380
-rw-r--r--vendor/push.lua131
10 files changed, 663 insertions, 16 deletions
diff --git a/fonts/Lato-Light.ttf b/fonts/Lato-Light.ttf
new file mode 100644
index 0000000..0809b8e
--- /dev/null
+++ b/fonts/Lato-Light.ttf
Binary files differ
diff --git a/fonts/Lato-Thin.ttf b/fonts/Lato-Thin.ttf
new file mode 100644
index 0000000..0f84dc1
--- /dev/null
+++ b/fonts/Lato-Thin.ttf
Binary files differ
diff --git a/fonts/weathericons-regular-webfont.ttf b/fonts/weathericons-regular-webfont.ttf
new file mode 100644
index 0000000..948f0a5
--- /dev/null
+++ b/fonts/weathericons-regular-webfont.ttf
Binary files differ
diff --git a/main.lua b/main.lua
index d2987ee..c9f63fb 100644
--- a/main.lua
+++ b/main.lua
@@ -1,9 +1,13 @@
-debugGraph = require 'vendor.debugGraph'
-inspect = require 'vendor.inspect'
+local debugGraph = require 'vendor.debugGraph'
+local inspect = require 'vendor.inspect'
+local push = require 'vendor.push'
+
+environment = os.getenv('ENV')
screens = {
+ require 'screens.weather',
+ require 'screens.time',
require 'screens.screen1',
- require 'screens.screen2',
}
state = {
@@ -15,18 +19,48 @@ state = {
stateCounter = 0,
}
+local gameWidth, gameHeight = 1280, 720
+local windowWidth, windowHeight = love.window.getDesktopDimensions()
+windowWidth, windowHeight = windowWidth*.5, windowHeight*.5 --make the window a bit smaller than the screen itself
+
+if environment == 'DEV' then
+ push:setupScreen(gameWidth, gameHeight, windowWidth, windowHeight, {fullscreen = false, resizable = true})
+else
+ push:setupScreen(gameWidth, gameHeight, gameWidth, gameHeight, {fullscreen = true})
+end
+
+function love.resize(w, h)
+ push:resize(w, h)
+ secondaryCanvas = love.graphics.newCanvas(push:getWidth(), push:getHeight())
+end
+
function love.load()
- love.window.setMode(1366, 768, {borderless=true})
+ love.mouse.setVisible( false )
+
+ secondaryCanvas = love.graphics.newCanvas(push:getWidth(), push:getHeight())
- secondaryCanvas = love.graphics.newCanvas(love.graphics.getWidth(), love.graphics.getHeight())
fpsGraph = debugGraph:new('fps', 0, 0)
memGraph = debugGraph:new('mem', 0, 30)
+
+ for key, node in ipairs(screens) do
+ node.load()
+ end
end
+function getw() return push:getWidth() end
+function geth() return push:getHeight() end
+
function love.draw()
- -- love.graphics.reset()
+ push:start()
+
+ -- Patch love.graphics.getWidth/Height to account for push
+ oldw, oldh = love.graphics.getWidth, love.graphics.getHeight
+ love.graphics.getWidth, love.graphics.getHeight = getw, geth
+
screens[state.currentScreen].render()
+
if state.transitioning then
+ -- Render next screen into canvas and fade accordingly
secondaryCanvas:renderTo(screens[state.currentScreen % #screens + 1].render)
love.graphics.setColor(255, 255, 255, 255 * (state.stateCounter / state.transitionTime)) -- red, green, blue, opacity (this would be white with 20% opacity)
love.graphics.draw(secondaryCanvas, 0, 0)
@@ -34,11 +68,15 @@ function love.draw()
-- Draw graphs
love.graphics.setColor(255, 255, 255, 128)
- --love.graphics.setNewFont(10)
- --love.graphics.print(inspect(state), 0, 60, 0)
+
+ -- love.graphics.setNewFont(10)
+ -- love.graphics.print(inspect(state), 0, 60, 0)
fpsGraph:draw()
memGraph:draw()
+
+ love.graphics.getWidth, love.graphics.getHeight = oldw, oldh
+ push:finish()
end
function love.update(dt)
diff --git a/screens/screen1.lua b/screens/screen1.lua
index 71f8fd4..8a62628 100644
--- a/screens/screen1.lua
+++ b/screens/screen1.lua
@@ -1,15 +1,19 @@
local node = {}
-function node.render()
-love.graphics.setColor( 0, 80, 0 )
-love.graphics.rectangle("fill", 0, 0, love.graphics.getWidth(), love.graphics.getHeight())
-love.graphics.setColor(255, 255, 255, 255)
-love.graphics.setNewFont(60)
+function node.load()
+end
-love.graphics.printf("Welcome to Warsaw Hackerspace\nextreme digital signage technology!", 0, love.graphics.getHeight()/2 - 30, love.graphics.getWidth(), 'center')
+function node.render()
+ love.graphics.setColor( 0, 0, 0 )
+ love.graphics.rectangle("fill", 0, 0, love.graphics.getWidth(), love.graphics.getHeight())
-love.graphics.setColor(255, 0, 0)
-love.graphics.circle("fill", 20, 300, 50)
+ for x = 0, love.graphics.getWidth() / 50, 1 do
+ for y = 0, love.graphics.getHeight() / 50, 1 do
+ local r = math.sin(x + love.timer.getTime() * 2) + math.cos(y + love.timer.getTime() * math.sin(x));
+ love.graphics.setColor(255, 255, 255, (r + 2) * 255)
+ love.graphics.circle("line", x * 50, y * 50, r * 10)
+ end
+ end
end
function node.update(dt)
diff --git a/screens/time.lua b/screens/time.lua
new file mode 100644
index 0000000..bfc7a2d
--- /dev/null
+++ b/screens/time.lua
@@ -0,0 +1,21 @@
+local node = {}
+local socket = require("socket")
+
+local textFont = love.graphics.newFont('fonts/Lato-Thin.ttf', 400)
+
+function node.load()
+end
+
+function node.render()
+ love.graphics.setColor( 0, 0, 0 )
+ love.graphics.rectangle("fill", 0, 0, love.graphics.getWidth(), love.graphics.getHeight())
+
+ love.graphics.setColor( 255, 255, 255 )
+ love.graphics.setFont(textFont);
+ love.graphics.printf(os.date('%H:%M'), 0, 120, love.graphics.getWidth(), 'center');
+end
+
+function node.update(dt)
+end
+
+return node
diff --git a/screens/weather.lua b/screens/weather.lua
new file mode 100644
index 0000000..df7a400
--- /dev/null
+++ b/screens/weather.lua
@@ -0,0 +1,55 @@
+local node = {}
+
+local inspect = require('vendor.inspect')
+
+local weatherFont = love.graphics.newFont('fonts/weathericons-regular-webfont.ttf', 400)
+local textFont = love.graphics.newFont('fonts/Lato-Thin.ttf', 300)
+local smallFont = love.graphics.newFont('fonts/Lato-Light.ttf', 20)
+
+local weatherGlyphs = {
+ snow = "",
+ mist = "",
+}
+
+local updateInterval = 60
+local lastUpdate = 0
+local state = {
+ weather = "snow",
+ temperature = 0,
+}
+
+function node.load()
+end
+
+function node.unload()
+end
+
+function node.render()
+ love.graphics.setColor( 0, 0, 0 )
+ love.graphics.rectangle("fill", 0, 0, love.graphics.getWidth(), love.graphics.getHeight())
+
+ love.graphics.setColor( 255, 255, 255 )
+
+ love.graphics.setFont(textFont);
+ love.graphics.printf(tostring(state.temperature) .. "°", 600, 180, 650, 'center');
+
+ love.graphics.setFont(weatherFont);
+ love.graphics.print(tostring(weatherGlyphs[state.weather]), 150, 0);
+
+ love.graphics.setFont(smallFont)
+ love.graphics.printf("piździ x---DD", 0, love.graphics.getHeight() - 40, love.graphics.getWidth(), 'center')
+end
+
+function node.update(dt)
+ if lastUpdate < love.timer.getTime() - updateInterval then
+ lastUpdate = love.timer.getTime()
+ print("update")
+ print(inspect(state))
+ local updateThread = love.thread.newThread('screens/weather_thread.lua')
+ updateThread:start()
+ end
+
+ state = love.thread.getChannel('weather'):pop() or state
+end
+
+return node
diff --git a/screens/weather_thread.lua b/screens/weather_thread.lua
new file mode 100644
index 0000000..7638c9a
--- /dev/null
+++ b/screens/weather_thread.lua
@@ -0,0 +1,18 @@
+local socket = require("socket")
+local http = require("socket.http")
+local json = require("vendor.json")
+local inspect = require('vendor.inspect')
+-- local weatherURL = 'http://api.wunderground.com/api/0def10027afaebb7/conditions/q/PL/Warszawa.json'
+local weatherURL = 'https://openweathermap.org/data/2.5/weather?id=6695624&units=metric&appid=b1b15e88fa797225412429c1c50c122a1'
+
+local r, c, h = http.request(weatherURL)
+if c == 200 then
+ local data = json.decode(r)
+ print(inspect(data), data.main.temp)
+ love.thread.getChannel('weather'):push({
+ weather = data.weather[1].main:lower(),
+ temperature = data.main.temp,
+ })
+else
+ print("failed")
+end
diff --git a/vendor/json.lua b/vendor/json.lua
new file mode 100644
index 0000000..dda6193
--- /dev/null
+++ b/vendor/json.lua
@@ -0,0 +1,380 @@
+--
+-- json.lua
+--
+-- Copyright (c) 2015 rxi
+--
+-- This library is free software; you can redistribute it and/or modify it
+-- under the terms of the MIT license. See LICENSE for details.
+--
+
+local json = { _version = "0.1.0" }
+
+-------------------------------------------------------------------------------
+-- Encode
+-------------------------------------------------------------------------------
+
+local encode
+
+local escape_char_map = {
+ [ "\\" ] = "\\\\",
+ [ "\"" ] = "\\\"",
+ [ "\b" ] = "\\b",
+ [ "\f" ] = "\\f",
+ [ "\n" ] = "\\n",
+ [ "\r" ] = "\\r",
+ [ "\t" ] = "\\t",
+}
+
+local escape_char_map_inv = { [ "\\/" ] = "/" }
+for k, v in pairs(escape_char_map) do
+ escape_char_map_inv[v] = k
+end
+
+
+local function escape_char(c)
+ return escape_char_map[c] or string.format("\\u%04x", c:byte())
+end
+
+
+local function encode_nil(val)
+ return "null"
+end
+
+
+local function encode_table(val, stack)
+ local res = {}
+ stack = stack or {}
+
+ -- Circular reference?
+ if stack[val] then error("circular reference") end
+
+ stack[val] = true
+
+ if val[1] ~= nil or next(val) == nil then
+ -- Treat as array -- check keys are valid and it is not sparse
+ local n = 0
+ for k in pairs(val) do
+ if type(k) ~= "number" then
+ error("invalid table: mixed or invalid key types")
+ end
+ n = n + 1
+ end
+ if n ~= #val then
+ error("invalid table: sparse array")
+ end
+ -- Encode
+ for i, v in ipairs(val) do
+ table.insert(res, encode(v, stack))
+ end
+ stack[val] = nil
+ return "[" .. table.concat(res, ",") .. "]"
+
+ else
+ -- Treat as an object
+ for k, v in pairs(val) do
+ if type(k) ~= "string" then
+ error("invalid table: mixed or invalid key types")
+ end
+ table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
+ end
+ stack[val] = nil
+ return "{" .. table.concat(res, ",") .. "}"
+ end
+end
+
+
+local function encode_string(val)
+ return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"'
+end
+
+
+local function encode_number(val)
+ -- Check for NaN, -inf and inf
+ if val ~= val or val <= -math.huge or val >= math.huge then
+ error("unexpected number value '" .. tostring(val) .. "'")
+ end
+ return string.format("%.14g", val)
+end
+
+
+local type_func_map = {
+ [ "nil" ] = encode_nil,
+ [ "table" ] = encode_table,
+ [ "string" ] = encode_string,
+ [ "number" ] = encode_number,
+ [ "boolean" ] = tostring,
+}
+
+
+encode = function(val, stack)
+ local t = type(val)
+ local f = type_func_map[t]
+ if f then
+ return f(val, stack)
+ end
+ error("unexpected type '" .. t .. "'")
+end
+
+
+function json.encode(val)
+ return ( encode(val) )
+end
+
+
+-------------------------------------------------------------------------------
+-- Decode
+-------------------------------------------------------------------------------
+
+local parse
+
+local function create_set(...)
+ local res = {}
+ for i = 1, select("#", ...) do
+ res[ select(i, ...) ] = true
+ end
+ return res
+end
+
+local space_chars = create_set(" ", "\t", "\r", "\n")
+local delim_chars = create_set(" ", "\t", "\r", "\n", "]", "}", ",")
+local escape_chars = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u")
+local literals = create_set("true", "false", "null")
+
+local literal_map = {
+ [ "true" ] = true,
+ [ "false" ] = false,
+ [ "null" ] = nil,
+}
+
+
+local function next_char(str, idx, set, negate)
+ for i = idx, #str do
+ if set[str:sub(i, i)] ~= negate then
+ return i
+ end
+ end
+ return #str + 1
+end
+
+
+local function decode_error(str, idx, msg)
+ local line_count = 1
+ local col_count = 1
+ for i = 1, idx - 1 do
+ col_count = col_count + 1
+ if str:sub(i, i) == "\n" then
+ line_count = line_count + 1
+ col_count = 1
+ end
+ end
+ error( string.format("%s at line %d col %d", msg, line_count, col_count) )
+end
+
+
+local function codepoint_to_utf8(n)
+ -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa
+ local f = math.floor
+ if n <= 0x7f then
+ return string.char(n)
+ elseif n <= 0x7ff then
+ return string.char(f(n / 64) + 192, n % 64 + 128)
+ elseif n <= 0xffff then
+ return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128)
+ elseif n <= 0x10ffff then
+ return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128,
+ f(n % 4096 / 64) + 128, n % 64 + 128)
+ end
+ error( string.format("invalid unicode codepoint '%x'", n) )
+end
+
+
+local function parse_unicode_escape(s)
+ local n1 = tonumber( s:sub(3, 6), 16 )
+ local n2 = tonumber( s:sub(9, 12), 16 )
+ -- Surrogate pair?
+ if n2 then
+ return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000)
+ else
+ return codepoint_to_utf8(n1)
+ end
+end
+
+
+local function parse_string(str, i)
+ local has_unicode_escape = false
+ local has_surrogate_escape = false
+ local has_escape = false
+ local last
+ for j = i + 1, #str do
+ local x = str:byte(j)
+
+ if x < 32 then
+ decode_error(str, j, "control character in string")
+ end
+
+ if last == 92 then -- "\\" (escape char)
+ if x == 117 then -- "u" (unicode escape sequence)
+ local hex = str:sub(j + 1, j + 5)
+ if not hex:find("%x%x%x%x") then
+ decode_error(str, j, "invalid unicode escape in string")
+ end
+ if hex:find("^[dD][89aAbB]") then
+ has_surrogate_escape = true
+ else
+ has_unicode_escape = true
+ end
+ else
+ local c = string.char(x)
+ if not escape_chars[c] then
+ decode_error(str, j, "invalid escape char '" .. c .. "' in string")
+ end
+ has_escape = true
+ end
+ last = nil
+
+ elseif x == 34 then -- '"' (end of string)
+ local s = str:sub(i + 1, j - 1)
+ if has_surrogate_escape then
+ s = s:gsub("\\u[dD][89aAbB]..\\u....", parse_unicode_escape)
+ end
+ if has_unicode_escape then
+ s = s:gsub("\\u....", parse_unicode_escape)
+ end
+ if has_escape then
+ s = s:gsub("\\.", escape_char_map_inv)
+ end
+ return s, j + 1
+
+ else
+ last = x
+ end
+ end
+ decode_error(str, i, "expected closing quote for string")
+end
+
+
+local function parse_number(str, i)
+ local x = next_char(str, i, delim_chars)
+ local s = str:sub(i, x - 1)
+ local n = tonumber(s)
+ if not n then
+ decode_error(str, i, "invalid number '" .. s .. "'")
+ end
+ return n, x
+end
+
+
+local function parse_literal(str, i)
+ local x = next_char(str, i, delim_chars)
+ local word = str:sub(i, x - 1)
+ if not literals[word] then
+ decode_error(str, i, "invalid literal '" .. word .. "'")
+ end
+ return literal_map[word], x
+end
+
+
+local function parse_array(str, i)
+ local res = {}
+ local n = 1
+ i = i + 1
+ while 1 do
+ local x
+ i = next_char(str, i, space_chars, true)
+ -- Empty / end of array?
+ if str:sub(i, i) == "]" then
+ i = i + 1
+ break
+ end
+ -- Read token
+ x, i = parse(str, i)
+ res[n] = x
+ n = n + 1
+ -- Next token
+ i = next_char(str, i, space_chars, true)
+ local chr = str:sub(i, i)
+ i = i + 1
+ if chr == "]" then break end
+ if chr ~= "," then decode_error(str, i, "expected ']' or ','") end
+ end
+ return res, i
+end
+
+
+local function parse_object(str, i)
+ local res = {}
+ i = i + 1
+ while 1 do
+ local key, val
+ i = next_char(str, i, space_chars, true)
+ -- Empty / end of object?
+ if str:sub(i, i) == "}" then
+ i = i + 1
+ break
+ end
+ -- Read key
+ if str:sub(i, i) ~= '"' then
+ decode_error(str, i, "expected string for key")
+ end
+ key, i = parse(str, i)
+ -- Read ':' delimiter
+ i = next_char(str, i, space_chars, true)
+ if str:sub(i, i) ~= ":" then
+ decode_error(str, i, "expected ':' after key")
+ end
+ i = next_char(str, i + 1, space_chars, true)
+ -- Read value
+ val, i = parse(str, i)
+ -- Set
+ res[key] = val
+ -- Next token
+ i = next_char(str, i, space_chars, true)
+ local chr = str:sub(i, i)
+ i = i + 1
+ if chr == "}" then break end
+ if chr ~= "," then decode_error(str, i, "expected '}' or ','") end
+ end
+ return res, i
+end
+
+
+local char_func_map = {
+ [ '"' ] = parse_string,
+ [ "0" ] = parse_number,
+ [ "1" ] = parse_number,
+ [ "2" ] = parse_number,
+ [ "3" ] = parse_number,
+ [ "4" ] = parse_number,
+ [ "5" ] = parse_number,
+ [ "6" ] = parse_number,
+ [ "7" ] = parse_number,
+ [ "8" ] = parse_number,
+ [ "9" ] = parse_number,
+ [ "-" ] = parse_number,
+ [ "t" ] = parse_literal,
+ [ "f" ] = parse_literal,
+ [ "n" ] = parse_literal,
+ [ "[" ] = parse_array,
+ [ "{" ] = parse_object,
+}
+
+
+parse = function(str, idx)
+ local chr = str:sub(idx, idx)
+ local f = char_func_map[chr]
+ if f then
+ return f(str, idx)
+ end
+ decode_error(str, idx, "unexpected character '" .. chr .. "'")
+end
+
+
+function json.decode(str)
+ if type(str) ~= "string" then
+ error("expected argument of type string, got " .. type(str))
+ end
+ return ( parse(str, next_char(str, 1, space_chars, true)) )
+end
+
+
+return json
diff --git a/vendor/push.lua b/vendor/push.lua
new file mode 100644
index 0000000..321ddca
--- /dev/null
+++ b/vendor/push.lua
@@ -0,0 +1,131 @@
+-- push.lua v0.1
+
+-- Copyright (c) 2016 Ulysse Ramage
+-- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+-- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+local push = {}
+setmetatable(push, push)
+
+function push:setupScreen(WWIDTH, WHEIGHT, RWIDTH, RHEIGHT, f)
+
+ f = f or {}
+
+ self._WWIDTH, self._WHEIGHT = WWIDTH, WHEIGHT
+ self._RWIDTH, self._RHEIGHT = RWIDTH, RHEIGHT
+ self._fullscreen = f.fullscreen or self._fullscreen or false
+ self._resizable = f.resizable or self._resizable or false
+ if f.canvas == nil then f.canvas = true end
+
+ love.window.setMode( self._RWIDTH, self._RHEIGHT, {fullscreen = self._fullscreen, borderless = false, resizable = self._resizable} )
+
+ self:initValues()
+
+ if f.canvas then self:createCanvas() end
+
+ self._borderColor = {0, 0, 0}
+
+ self._drawFunctions = {["start"]=push.start, ["end"]=push.finish}
+end
+
+function push:createCanvas()
+ self._canvas = love.graphics.newCanvas(self._WWIDTH, self._WHEIGHT)
+end
+
+function push:initValues()
+ self._SCALEX, self._SCALEY = self._RWIDTH/self._WWIDTH, self._RHEIGHT/self._WHEIGHT
+ self._SCALE = math.min(self._SCALEX, self._SCALEY)
+ self._OFFSET = {x = (self._SCALEX - self._SCALE) * (self._WWIDTH/2), y = (self._SCALEY - self._SCALE) * (self._WHEIGHT/2)}
+ self._GWIDTH, self._GHEIGHT = self._RWIDTH-self._OFFSET.x*2, self._RHEIGHT-self._OFFSET.y*2
+
+ self._INV_SCALE = 1/self._SCALE
+end
+
+function push:setShader(shader)
+ self._shader = shader
+end
+
+--[[ DEPRECATED ]]--
+function push:apply(operation, shader)
+ if operation == "start" then
+ self:start()
+ elseif operation == "finish" or operation == "end" then
+ self:finish(shader)
+ end
+end
+
+function push:start()
+ if self._canvas then
+ love.graphics.push()
+ love.graphics.setCanvas(self._canvas)
+ else
+ love.graphics.translate(self._OFFSET.x, self._OFFSET.y)
+ love.graphics.setScissor(self._OFFSET.x, self._OFFSET.y, self._WWIDTH*self._SCALE, self._WHEIGHT*self._SCALE)
+ love.graphics.push()
+ love.graphics.scale(self._SCALE)
+ end
+end
+
+function push:finish(shader)
+ love.graphics.setBackgroundColor(unpack(self._borderColor))
+ if self._canvas then
+ love.graphics.pop()
+ love.graphics.setCanvas()
+
+ love.graphics.translate(self._OFFSET.x, self._OFFSET.y)
+ love.graphics.setColor(255, 255, 255)
+ love.graphics.setShader(shader or self._shader)
+ love.graphics.draw(self._canvas, 0, 0, 0, self._SCALE, self._SCALE)
+ love.graphics.setCanvas(self._canvas)
+ love.graphics.clear()
+ love.graphics.setCanvas()
+ love.graphics.setShader()
+ else
+ love.graphics.pop()
+ love.graphics.setScissor()
+ end
+end
+
+function push:calculateScale(offset)
+ self._SCALEX, self._SCALEY = self._RWIDTH/self._WWIDTH, self._RHEIGHT/self._WHEIGHT
+ self._SCALE = math.min(self._SCALEX, self._SCALEY)+offset
+ self._OFFSET = {x = (self._SCALEX - self._SCALE) * (self._WWIDTH/2), y = (self._SCALEY - self._SCALE) * (self._WHEIGHT/2)}
+end
+
+function push:setBorderColor(color, g, b)
+ self._borderColor = g and {color, g, b} or color
+end
+
+function push:toGame(x, y)
+ x, y = x-self._OFFSET.x, y-self._OFFSET.y
+ local normalX, normalY = x/self._GWIDTH, y/self._GHEIGHT
+ x, y = (x>=0 and x<=self._WWIDTH*self._SCALE) and normalX*self._WWIDTH or nil, (y>=0 and y<=self._WHEIGHT*self._SCALE) and normalY*self._WHEIGHT or nil
+ return x, y
+end
+
+--doesn't work - TODO
+function push:toReal(x, y)
+ return x+self._OFFSET.x, y+self._OFFSET.y
+end
+
+function push:switchFullscreen(winw, winh)
+ self._fullscreen = not self._fullscreen
+ local windowWidth, windowHeight = love.window.getDesktopDimensions()
+ self._RWIDTH = self._fullscreen and windowWidth or winw or windowWidth*.5
+ self._RHEIGHT = self._fullscreen and windowHeight or winh or windowHeight*.5
+ self:initValues()
+ love.window.setFullscreen(self._fullscreen, "desktop")
+end
+
+function push:resize(w, h)
+ self._RWIDTH = w
+ self._RHEIGHT = h
+ self:initValues()
+end
+
+function push:getWidth() return self._WWIDTH end
+function push:getHeight() return self._WHEIGHT end
+function push:getDimensions() return self._WWIDTH, self._WHEIGHT end
+
+return push