LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-13 17:10:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-09-18 02:15:20 -03:00
parent d1bdc9a7e2 417173b43a
commit fffbd3ecab
12 changed files with 141 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/boot.lua
+6 -5
View File
@@ -81,6 +81,8 @@ end
-- Returns the leaf of a full path.
function love.path.leaf(p)
p = love.path.normalslashes(p)
local a = 1
local last = p
@@ -1420,9 +1422,8 @@ function love.nogame()
g_time = g_time + dt / 2
local int, frac = math.modf(g_time)
update_rain(frac)
local scale = love.window.getPixelScale()
inspector.x = love.graphics.getWidth() * 0.45 / scale
inspector.y = love.graphics.getHeight() * 0.55 / scale
inspector.x = love.window.fromPixels(love.graphics.getWidth() * 0.45)
inspector.y = love.window.fromPixels(love.graphics.getHeight() * 0.55)
end
local function draw_grid()
@@ -1552,7 +1553,7 @@ function love.errhand(msg)
end
if love.audio then love.audio.stop() end
love.graphics.reset()
local font = love.graphics.setNewFont(math.floor(14 * love.window.getPixelScale()))
local font = love.graphics.setNewFont(math.floor(love.window.toPixels(14)))
local sRGB = select(3, love.window.getMode()).srgb
if sRGB and love.math then
@@ -1586,7 +1587,7 @@ function love.errhand(msg)
p = string.gsub(p, "%[string \"(.-)\"%]", "%1")
local function draw()
local pos = 70 * love.window.getPixelScale()
local pos = love.window.toPixels(70)
love.graphics.clear()
love.graphics.printf(p, pos, pos, love.graphics.getWidth() - pos)
love.graphics.present()