AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 12:25:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix async font loading

Browse Source 
Sometimes it uses unicode font wrongly
This commit is contained in:
Bixilon 2022-04-22 16:00:40 +02:00
parent f53fb5a9e3
commit d276de0bbb
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/de/bixilon/minosoft/gui/rendering/font/FontLoader.kt
View File

@ -13,8 +13,8 @@
package de.bixilon.minosoft.gui.rendering.font
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.kutil.check.CheckUtil.check
import de.bixilon.kutil.collections.CollectionUtil.synchronizedListOf
import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
import de.bixilon.kutil.latch.CountUpAndDownLatch
import de.bixilon.minosoft.assets.util.FileUtil.readJsonObject
@ -36,14 +36,15 @@ object FontLoader : DefaultFactory<FontProviderFactory<*>>(
fun load(renderWindow: RenderWindow, latch: CountUpAndDownLatch): Font {
val fontIndex = renderWindow.connection.assetsManager[FONT_INDEX].readJsonObject()
val providers: MutableList<FontProvider> = synchronizedListOf()
val providersRaw = fontIndex["providers"].listCast<Map<String, Any>>()!!
val providers: Array<FontProvider?> = arrayOfNulls(providersRaw.size)
val fontLatch = CountUpAndDownLatch(1, latch)
for (provider in fontIndex["providers"].listCast<Map<String, Any>>()!!) {
for ((index, provider) in providersRaw.withIndex()) {
val type = provider["type"].toResourceLocation()
fontLatch.inc()
DefaultThreadPool += {
providers += this[type].check { "Unknown font provider type $type" }.build(renderWindow, provider)
providers[index] = this[type].check { "Unknown font provider type $type" }.build(renderWindow, provider)
fontLatch.dec()
}
}
@ -51,7 +52,7 @@ object FontLoader : DefaultFactory<FontProviderFactory<*>>(
fontLatch.await()
return Font(
providers = providers.toTypedArray(),
providers = providers.unsafeCast(),
)
}
}