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

textures: pre load array async

Browse Source
This commit is contained in:
Bixilon 2023-05-31 21:11:21 +02:00
parent dd28d3c16b
commit bf9032c376
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureArray.kt
View File

@ -15,7 +15,11 @@ package de.bixilon.minosoft.gui.rendering.system.opengl.texture
import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec2.Vec2
import de.bixilon.kutil.concurrent.pool.DefaultThreadPool import de.bixilon.kutil.concurrent.pool.DefaultThreadPool
import de.bixilon.kutil.concurrent.pool.ThreadPool
import de.bixilon.kutil.concurrent.pool.runnable.ForcePooledRunnable
import de.bixilon.kutil.concurrent.pool.runnable.SimplePoolRunnable
import de.bixilon.kutil.latch.AbstractLatch import de.bixilon.kutil.latch.AbstractLatch
import de.bixilon.kutil.latch.SimpleLatch
import de.bixilon.minosoft.assets.util.InputStreamUtil.readAsString import de.bixilon.minosoft.assets.util.InputStreamUtil.readAsString
import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.data.registries.identified.ResourceLocation
import de.bixilon.minosoft.gui.rendering.RenderContext import de.bixilon.minosoft.gui.rendering.RenderContext
@ -58,7 +62,7 @@ class OpenGLTextureArray(
textures[resourceLocation]?.let { return it } textures[resourceLocation]?.let { return it }
// load .mcmeta // load .mcmeta
val properties = readImageProperties(resourceLocation) ?: ImageProperties() val properties = readImageProperties(resourceLocation) ?: ImageProperties() // TODO: That kills performance
val texture = if (properties.animation == null) { val texture = if (properties.animation == null) {
default() default()
@ -69,7 +73,7 @@ class OpenGLTextureArray(
texture.properties = properties texture.properties = properties
textures[resourceLocation] = texture textures[resourceLocation] = texture
if (loadTexturesAsync) { if (loadTexturesAsync) {
DefaultThreadPool += { texture.load(context.connection.assetsManager) } DefaultThreadPool += ForcePooledRunnable { texture.load(context.connection.assetsManager) }
} }
return texture return texture
@ -85,17 +89,24 @@ class OpenGLTextureArray(
return null return null
} }
@Synchronized @Synchronized
override fun preLoad(latch: AbstractLatch) { override fun preLoad(latch: AbstractLatch) {
if (state == TextureArrayStates.LOADED || state == TextureArrayStates.PRE_LOADED) { if (state == TextureArrayStates.LOADED || state == TextureArrayStates.PRE_LOADED) {
return return
} }
val preLoadLatch = SimpleLatch(textures.size)
for (texture in textures.values) {
if (texture.state != TextureStates.DECLARED) {
preLoadLatch.dec()
continue
}
DefaultThreadPool += SimplePoolRunnable(ThreadPool.HIGH) { texture.load(context.connection.assetsManager) }
}
preLoadLatch.await()
var lastAnimationIndex = 0 var lastAnimationIndex = 0
for (texture in textures.values) { for (texture in textures.values) {
if (texture.state == TextureStates.DECLARED) {
texture.load(context.connection.assetsManager)
}
check(texture.size.x <= TEXTURE_MAX_RESOLUTION) { "Texture's width exceeds $TEXTURE_MAX_RESOLUTION (${texture.size.x}" } check(texture.size.x <= TEXTURE_MAX_RESOLUTION) { "Texture's width exceeds $TEXTURE_MAX_RESOLUTION (${texture.size.x}" }
check(texture.size.y <= TEXTURE_MAX_RESOLUTION) { "Texture's height exceeds $TEXTURE_MAX_RESOLUTION (${texture.size.y}" } check(texture.size.y <= TEXTURE_MAX_RESOLUTION) { "Texture's height exceeds $TEXTURE_MAX_RESOLUTION (${texture.size.y}" }