core/assets: add a config file for imagefonts

This commit is contained in:
Kazhnuz 2019-03-03 18:40:11 +01:00
parent cc24fc300b
commit e458603918
4 changed files with 13 additions and 6 deletions

View File

@ -0,0 +1,5 @@
return {
filename = "medium.png",
glyphs = "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ",
extraspacing = 1,
}

View File

@ -1,8 +1,10 @@
local Font = require "core.modules.assets.fonts"
local ImageFont = Font:extend()
function ImageFont:new(filename, glyphs, extraspacing)
self.font = love.graphics.newImageFont(filename, glyphs, extraspacing)
function ImageFont:new(filename, extraspacing)
local data = require(filename)
local extraspacing = extraspacing or data.extraspacing or 1
self.font = love.graphics.newImageFont(filename .. ".png", data.glyphs, extraspacing)
self.filter = ""
self:setColor(1, 1, 1, 1)
self:setSpacing(false, 0)

View File

@ -166,8 +166,8 @@ function Assets:addFont(key, filename, size)
self.fonts[key] = font
end
function Assets:addImageFont(key, filename, glyphs, extraspacing)
local font = ImageFont(filename, glyphs, extraspacing)
function Assets:addImageFont(key, filename, extraspacing)
local font = ImageFont(filename, extraspacing)
self.fonts[key] = font
end

View File

@ -11,8 +11,8 @@ function MainMenu:new()
MainMenu.super.new(self)
self:createBackground("assets/backgrounds/back.png", "assets/sprites/gui/emblem.png")
self.assets:addImageFont("small", "assets/fonts/small.png", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ", 1)
self.assets:addImageFont("medium", "assets/fonts/medium.png", "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|} ", 1)
self.assets:addImageFont("small", "assets/fonts/small", 1)
self.assets:addImageFont("medium", "assets/fonts/medium", 1)
menus.Create(self)