refactor Font into utils

Sasszem · May 9, 2020 · 2f0b08c · 2f0b08c
1 parent 17806c8
commit 2f0b08c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/Font.lua b/Font.lua
diff --git a/GUI.lua b/GUI.lua
@@ -1,5 +1,4 @@
 local VDiv = require("VDiv")
-local Font = require("Font")
 local GUI = VDiv:extend()
 
 function GUI:new(...)

diff --git a/utils.lua b/utils.lua
@@ -14,4 +14,21 @@ function centerBox(bX, bY, bW, bH, w, h)
     local x = bX + (bW-w)/2
     local y = bY + (bH-h)/2
     return x, y
+end
+
+local cache = {}
+
+function Font(size, file)
+    local fileN = file or "DEFAULT"
+    if cache[size] then
+        if cache[size][fileN] then
+            return cache[size][fileN]
+        end
+    end
+    local f = love.graphics.newFont(size, file)
+    if not cache[size] then
+        cache[size] = {}
+    end
+    cache[size][fileN] = f
+    return f
 end
diff --git a/yalg.lua b/yalg.lua
@@ -5,5 +5,4 @@ VDiv = require("VDiv")
 HDiv = require("HDiv")
 Button = require("Button")
 Label = require("Label")
-Font = require("Font")
 Switcher = require("Switcher")