diff --git a/lib/simple_ui/level/bar.lua b/lib/simple_ui/level/bar.lua index aa3d723..b91701e 100644 --- a/lib/simple_ui/level/bar.lua +++ b/lib/simple_ui/level/bar.lua @@ -57,6 +57,8 @@ function barElement:draw() love.graphics.setColor(1, 1, 1) --- текст поверх if self.drawText then + local font = Tree.fonts:getDefaultTheme():getVariant("small") + love.graphics.setFont(font) love.graphics.printf(tostring(self.value) .. "/" .. tostring(self.maxValue), self.bounds.x, self.bounds.y, self.bounds.width, "center") end diff --git a/lib/simple_ui/level/end_turn.lua b/lib/simple_ui/level/end_turn.lua index 53c506c..e1cb679 100644 --- a/lib/simple_ui/level/end_turn.lua +++ b/lib/simple_ui/level/end_turn.lua @@ -22,8 +22,8 @@ function endTurnButton:update(dt) end function endTurnButton:layout() - local font = love.graphics.newFont(16) - self.text = love.graphics.newText(font, "end_turn") + local font = Tree.fonts:getDefaultTheme():getVariant("headline") + self.text = love.graphics.newText(font, "Завершить ход") self.bounds.width = self.text:getWidth() + 32 self.bounds.height = self.text:getHeight() + 16 end diff --git a/lib/tree.lua b/lib/tree.lua index 1a52370..a023fdc 100644 --- a/lib/tree.lua +++ b/lib/tree.lua @@ -6,7 +6,7 @@ Tree = { assets = (require "lib.utils.asset_bundle"):load() } -Tree.fonts = (require "lib.utils.font_manager"):load("WDXL_Lubrifont_TC") -- дефолтный шрифт +Tree.fonts = (require "lib.utils.font_manager"):load("WDXL_Lubrifont_TC"):loadTheme("Roboto_Mono") -- дефолтный шрифт Tree.panning = require "lib/panning" Tree.controls = require "lib.controls" Tree.level = (require "lib.level.level").new("procedural", "flower_plains") -- для теста у нас только один уровень, который сразу же загружен diff --git a/main.lua b/main.lua index 3b2629c..bd2a7a8 100644 --- a/main.lua +++ b/main.lua @@ -64,6 +64,7 @@ function love.draw() testLayout:draw() love.graphics.setColor(1, 1, 1) + love.graphics.setFont(Tree.fonts:getTheme("Roboto_Mono"):getVariant("medium")) local stats = "fps: " .. love.timer.getFPS() .. " lt: " .. lt .. " dt: " .. dt .. " mem: " .. string.format("%.2f MB", collectgarbage("count") / 1000)