From 1b9b0193c00e0d54cf1b50635d33b3bbce60e872 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 2 Aug 2016 12:16:12 +0200 Subject: Clean-up obsolete fonts --- assets/font-big.png | Bin 0 -> 1118 bytes assets/font-normal.png | Bin 0 -> 1689 bytes assets/font2.png | Bin 3539 -> 0 bytes assets/font3.png | Bin 1118 -> 0 bytes main.lua | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 assets/font-big.png create mode 100644 assets/font-normal.png delete mode 100644 assets/font2.png delete mode 100644 assets/font3.png diff --git a/assets/font-big.png b/assets/font-big.png new file mode 100644 index 0000000..48b2e82 Binary files /dev/null and b/assets/font-big.png differ diff --git a/assets/font-normal.png b/assets/font-normal.png new file mode 100644 index 0000000..12dae64 Binary files /dev/null and b/assets/font-normal.png differ diff --git a/assets/font2.png b/assets/font2.png deleted file mode 100644 index 20ac02f..0000000 Binary files a/assets/font2.png and /dev/null differ diff --git a/assets/font3.png b/assets/font3.png deleted file mode 100644 index 48b2e82..0000000 Binary files a/assets/font3.png and /dev/null differ diff --git a/main.lua b/main.lua index 2669ef8..cb9b1f2 100644 --- a/main.lua +++ b/main.lua @@ -10,7 +10,8 @@ end -- Should be moved to scene/camera function getScale() - return math.max(1, math.floor(love.graphics.getWidth() / 320)-1, math.floor(love.graphics.getHeight() / 180)-1) + return getRealScale() + --return math.max(1, math.floor(love.graphics.getWidth() / 320)-1, math.floor(love.graphics.getHeight() / 180)-1) end function getRealScale() return math.max(love.graphics.getWidth() / 320, love.graphics.getHeight() / 180) @@ -46,9 +47,8 @@ function love.load() love.graphics.setDefaultFilter("nearest", "nearest") -- Font - -- 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-,!:()[]{}<> - Font = love.graphics.newImageFont("assets/font4.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1) - Bold = love.graphics.newImageFont("assets/font3.png", " 0123456789AEFILNORSTUW", -2) + Font = love.graphics.newImageFont("assets/font-normal.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1) + Bold = love.graphics.newImageFont("assets/font-big.png", " 0123456789AEFILNORSTUW", -2) Font:setLineHeight(9/16) love.graphics.setFont(Font) -- cgit v1.1