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

load models after init of renderers

Browse Source 
+ crash fix
This commit is contained in:
Moritz Zwerger 2023-11-18 21:33:34 +01:00
parent b27c9a509b
commit 651a12337f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt
View File

@ -77,7 +77,6 @@ object RenderLoader {
textures.initializeSkins(connection) textures.initializeSkins(connection)
textures.loadDefaultTextures() textures.loadDefaultTextures()
font = FontManager.create(this, initLatch) font = FontManager.create(this, initLatch)
models.load(latch)
framebuffer.init() framebuffer.init()
@ -91,6 +90,7 @@ object RenderLoader {
// Wait for init stage to complete // Wait for init stage to complete
initLatch.dec() initLatch.dec()
initLatch.await() initLatch.await()
models.load(latch)
renderer[GUIRenderer]?.atlas?.load() // TODO: remove this renderer[GUIRenderer]?.atlas?.load() // TODO: remove this

2
src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt
View File

@ -46,7 +46,7 @@ class ArmRenderer(override val context: RenderContext) : Renderer, Drawable {
override val framebuffer get() = context.framebuffer.gui override val framebuffer get() = context.framebuffer.gui
val shader = context.system.createShader(minosoft("entities/player/arm")) { ArmShader(it) } val shader = context.system.createShader(minosoft("entities/player/arm")) { ArmShader(it) }
init { override fun init(latch: AbstractLatch) {
registerModels() registerModels()
} }