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

texture array: only load image properties when needed, allow unnamed textures

Browse Source
This commit is contained in:
Bixilon 2023-06-17 01:45:16 +02:00
parent 5b19803823
commit 26f172df71
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
6 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontTypeTest.kt
View File

@ -3,6 +3,7 @@ package de.bixilon.minosoft.gui.rendering.font.types.bitmap
import de.bixilon.kotlinglm.vec2.Vec2
import de.bixilon.kotlinglm.vec2.Vec2i
import de.bixilon.minosoft.gui.rendering.font.types.empty.EmptyCodeRenderer
import de.bixilon.minosoft.gui.rendering.system.base.texture.data.TextureData
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
import de.bixilon.minosoft.gui.rendering.system.dummy.texture.DummyTexture
import org.testng.Assert.*
@ -47,7 +48,7 @@ class BitmapFontTypeTest {
val texture = DummyTexture()
texture.size = size
texture.data = buffer
texture.data = TextureData(size, buffer)
return texture
}

10
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyStaticTextureArray.kt
View File

@ -25,11 +25,17 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.sprite.SpriteAnimat
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
class DummyStaticTextureArray(renderSystem: RenderSystem) : StaticTextureArray {
override val textures: MutableMap<ResourceLocation, Texture> = synchronizedMapOf()
private val textures: MutableMap<ResourceLocation, Texture> = synchronizedMapOf()
override val animator: SpriteAnimator = SpriteAnimator(renderSystem)
override val state: TextureArrayStates = TextureArrayStates.DECLARED
override fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean, default: (mipmaps: Boolean) -> Texture): Texture {
override fun get(resourceLocation: ResourceLocation): Texture? = textures[resourceLocation]
override fun pushTexture(texture: Texture) {
TODO("Not yet implemented")
}
override fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean, properties: Boolean, default: (mipmaps: Boolean) -> Texture): Texture {
return textures.getOrPut(resourceLocation) { DummyTexture() }
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/font/types/bitmap/BitmapFontType.kt
View File

@ -72,7 +72,7 @@ class BitmapFontType(
private fun load(file: ResourceLocation, height: Int, ascent: Int, chars: List<String>, context: RenderContext): BitmapFontType? {
if (chars.isEmpty() || height <= 0) return null
val texture = context.textureManager.staticTextures.createTexture(file, mipmaps = false)
val texture = context.textureManager.staticTextures.createTexture(file, mipmaps = false, properties = false)
texture.load(context) // force load it, we need to calculate the width of every char
return load(texture, height, ascent, chars.codePoints())

2
src/main/java/de/bixilon/minosoft/gui/rendering/font/types/unicode/legacy/LegacyUnicodeFontType.kt
View File

@ -83,7 +83,7 @@ class LegacyUnicodeFontType(
sizes.skip(PAGE_SIZE.toLong())
return
}
val texture = textures.createTexture(textureFile, mipmaps = false)
val texture = textures.createTexture(textureFile, mipmaps = false, properties = false)
loadPage(pageId, texture, chars, sizes)
}

8
src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/array/StaticTextureArray.kt
View File

@ -20,15 +20,13 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.file.PNGTexture
interface StaticTextureArray : TextureArray {
val textures: MutableMap<ResourceLocation, Texture>
val animator: SpriteAnimator
val state: TextureArrayStates
fun get(resourceLocation: ResourceLocation): Texture? {
return textures[resourceLocation]
}
fun get(resourceLocation: ResourceLocation): Texture?
fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean = true, default: (mipmaps: Boolean) -> Texture = { PNGTexture(resourceLocation, mipmaps = it) }): Texture
fun pushTexture(texture: Texture)
fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean = true, properties: Boolean = true, default: (mipmaps: Boolean) -> Texture = { PNGTexture(resourceLocation, mipmaps = it) }): Texture
fun preLoad(latch: AbstractLatch)
}

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

@ -44,32 +44,45 @@ import org.lwjgl.opengl.GL13.GL_TEXTURE0
import org.lwjgl.opengl.GL13.glActiveTexture
import org.lwjgl.opengl.GL30.GL_TEXTURE_2D_ARRAY
import java.nio.ByteBuffer
import java.util.concurrent.atomic.AtomicInteger
class OpenGLTextureArray(
val context: RenderContext,
private val loadTexturesAsync: Boolean = true,
override val textures: MutableMap<ResourceLocation, Texture> = mutableMapOf(),
) : StaticTextureArray {
override val animator = SpriteAnimator(context.renderSystem)
private val namedTextures: MutableMap<ResourceLocation, Texture> = mutableMapOf()
private val otherTextures: MutableSet<Texture> = mutableSetOf()
private var textureIds = IntArray(TEXTURE_RESOLUTION_ID_MAP.size) { -1 }
override val animator = SpriteAnimator(context.renderSystem)
override var state: TextureArrayStates = TextureArrayStates.DECLARED
private set
private val texturesByResolution = Array<MutableList<Texture>>(TEXTURE_RESOLUTION_ID_MAP.size) { mutableListOf() }
private val lastTextureId = IntArray(TEXTURE_RESOLUTION_ID_MAP.size)
override fun get(resourceLocation: ResourceLocation): Texture? {
return this.namedTextures[resourceLocation]
}
@Synchronized
override fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean, default: (mipmaps: Boolean) -> Texture): Texture {
textures[resourceLocation]?.let { return it }
override fun pushTexture(texture: Texture) {
otherTextures += texture
if (texture.state != TextureStates.LOADED && loadTexturesAsync) {
DefaultThreadPool += ForcePooledRunnable { texture.load(context) }
}
}
@Synchronized
override fun createTexture(resourceLocation: ResourceLocation, mipmaps: Boolean, properties: Boolean, default: (mipmaps: Boolean) -> Texture): Texture {
namedTextures[resourceLocation]?.let { return it }
// load .mcmeta
val properties = readImageProperties(resourceLocation) ?: ImageProperties() // TODO: That kills performance
val properties = if (properties) readImageProperties(resourceLocation) ?: ImageProperties.DEFAULT else ImageProperties.DEFAULT // TODO: That kills performance
val texture = if (properties.animation == null) default(mipmaps) else SpriteTexture(default(mipmaps))
val texture = if (properties.animation == null) default(mipmaps) else SpriteTexture(default(false))
texture.properties = properties
textures[resourceLocation] = texture
namedTextures[resourceLocation] = texture
if (loadTexturesAsync) {
DefaultThreadPool += ForcePooledRunnable { texture.load(context) }
}
@ -88,23 +101,18 @@ class OpenGLTextureArray(
}
@Synchronized
override fun preLoad(latch: AbstractLatch) {
if (state == TextureArrayStates.LOADED || state == TextureArrayStates.PRE_LOADED) {
return
}
val preLoadLatch = SimpleLatch(textures.size)
for (texture in textures.values) {
private fun preLoad(latch: AbstractLatch, textures: Collection<Texture>) {
for (texture in textures) {
if (texture.state != TextureStates.DECLARED) {
preLoadLatch.dec()
latch.dec()
continue
}
DefaultThreadPool += SimplePoolRunnable(ThreadPool.HIGH) { texture.load(context) }
}
preLoadLatch.await()
}
var lastAnimationIndex = 0
for (texture in textures.values) {
private fun preLoad(animationIndex: AtomicInteger, textures: Collection<Texture>) {
for (texture in textures) {
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}" }
@ -130,7 +138,7 @@ class OpenGLTextureArray(
val array = TextureArrayProperties(uvEnd ?: Vec2(1.0f, 1.0f), arrayResolution, singlePixelSize)
if (texture is SpriteTexture) {
val animationIndex = lastAnimationIndex++
val animationIndex = animationIndex.getAndIncrement()
val animation = TextureAnimation(texture)
animator.animations += animation
texture.renderData = OpenGLTextureData(-1, -1, uvEnd, animationIndex)
@ -148,6 +156,21 @@ class OpenGLTextureArray(
texture.array = array
}
}
}
@Synchronized
override fun preLoad(latch: AbstractLatch) {
if (state == TextureArrayStates.LOADED || state == TextureArrayStates.PRE_LOADED) {
return
}
val preLoadLatch = SimpleLatch(namedTextures.size + otherTextures.size)
preLoad(preLoadLatch, namedTextures.values)
preLoad(preLoadLatch, otherTextures)
preLoadLatch.await()
val animationIndex = AtomicInteger()
preLoad(animationIndex, namedTextures.values)
preLoad(animationIndex, otherTextures)
state = TextureArrayStates.PRE_LOADED
}
@ -186,7 +209,7 @@ class OpenGLTextureArray(
textureIds[index] = loadSingleArray(TEXTURE_RESOLUTION_ID_MAP[index], textures)
totalLayers += textures.size
}
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Loaded ${textures.size} textures containing ${animator.animations.size} animated ones, split into $totalLayers layers!" }
Log.log(LogMessageType.RENDERING_LOADING, LogLevels.VERBOSE) { "Loaded ${namedTextures.size} textures containing ${animator.animations.size} animated ones, split into $totalLayers layers!" }
animator.init()
state = TextureArrayStates.LOADED