[enhancement] only load Minecraftia resource once

zeroeightysix · Mar 4, 2021 · f5ac8ec · f5ac8ec
1 parent 47891de
commit f5ac8ec
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/src/main/kotlin/me/zeroeightsix/kami/gui/KamiImgui.kt b/src/main/kotlin/me/zeroeightsix/kami/gui/KamiImgui.kt
@@ -36,8 +36,10 @@ object KamiImgui {
     private const val minecraftiaLocation = "/assets/kami/Minecraftia.ttf"
 
     fun init() {
-        fun addKamiFontFromTTF(filename: String, sizePixels: Float, fontCfg: ImFontConfig): ImFont? {
-            val bytes = ByteStreams.toByteArray(javaClass.getResourceAsStream(filename) ?: return null)
+        fun loadFontFromResources(filename: String): ByteArray? {
+            return ByteStreams.toByteArray(javaClass.getResourceAsStream(filename) ?: return null)
+        }
+        fun addKamiFontFromTTF(bytes: ByteArray, sizePixels: Float, fontCfg: ImFontConfig): ImFont? {
             return ImGui.getIO().fonts.addFontFromMemoryTTF(bytes, sizePixels, fontCfg)
         }
 
@@ -55,28 +57,31 @@ object KamiImgui {
             return fontCfg
         }
 
-        addKamiFontFromTTF(
-            minecraftiaLocation,
-            12f,
-            fontCfg {
-                oversampleH = 1
-                oversampleV = 1
-                pixelSnapH = true
+        loadFontFromResources(minecraftiaLocation)?.let { bytes ->
+            addKamiFontFromTTF(
+                bytes,
+                12f,
+                fontCfg {
+                    oversampleH = 1
+                    oversampleV = 1
+                    pixelSnapH = true
+                }
+            )?.let {
+                fonts.put("Minecraftia 12px", it)
             }
-        )?.let {
-            fonts.put("Minecraftia 12px", it)
-        }
-        addKamiFontFromTTF(
-            minecraftiaLocation,
-            24f,
-            fontCfg {
-                oversampleH = 1
-                oversampleV = 1
-                pixelSnapH = true
+            addKamiFontFromTTF(
+                bytes,
+                24f,
+                fontCfg {
+                    oversampleH = 1
+                    oversampleV = 1
+                    pixelSnapH = true
+                }
+            )?.let {
+                fonts.put("Minecraftia 24px", it)
             }
-        )?.let {
-            fonts.put("Minecraftia 24px", it)
         }
+
         ImGui.getIO().fonts.addFontDefault()?.let {
             fonts.put("Default", it)
         }
@@ -132,4 +137,4 @@ object KamiImgui {
     fun mouseScroll(d: Double, e: Double) {
         imguiGlfw.scrollCallback(mc.window.handle, d, e)
     }
-}
+}