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

Mesh: unload data if not loaded yet

Browse Source 
That should fix some memory leaks (especially in entity rendering)
This commit is contained in:
Moritz Zwerger 2023-11-03 15:44:07 +01:00
parent 2d18be7ee4
commit 00ab71e73b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt
View File

@ -39,10 +39,14 @@ class ChunkMesher(
} }
val sectionNeighbours = ChunkUtil.getDirectNeighbours(neighbours, item.chunk, item.section.sectionHeight) val sectionNeighbours = ChunkUtil.getDirectNeighbours(neighbours, item.chunk, item.section.sectionHeight)
val mesh = ChunkMeshes(renderer.context, item.chunkPosition, item.sectionHeight, item.section.smallMesh) val mesh = ChunkMeshes(renderer.context, item.chunkPosition, item.sectionHeight, item.section.smallMesh)
solid.mesh(item.chunkPosition, item.sectionHeight, item.chunk, item.section, neighbours, sectionNeighbours, mesh) try {
solid.mesh(item.chunkPosition, item.sectionHeight, item.chunk, item.section, neighbours, sectionNeighbours, mesh)
if (item.section.blocks.fluidCount > 0) { if (item.section.blocks.fluidCount > 0) {
fluid.mesh(item.chunkPosition, item.sectionHeight, item.chunk, item.section, neighbours, sectionNeighbours, mesh) fluid.mesh(item.chunkPosition, item.sectionHeight, item.chunk, item.section, neighbours, sectionNeighbours, mesh)
}
} finally {
mesh.unload()
} }
return mesh return mesh

1
src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/hitbox/HitboxFeature.kt
View File

@ -135,7 +135,6 @@ class HitboxFeature(renderer: EntityRenderer<*>) : EntityRenderFeature(renderer)
override fun unload() { override fun unload() {
val mesh = this.mesh ?: return val mesh = this.mesh ?: return
this.mesh = null this.mesh = null
if (mesh.state != Mesh.MeshStates.LOADED) return
renderer.renderer.queue += { mesh.unload() } renderer.renderer.queue += { mesh.unload() }
} }
} }

1
src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt
View File

@ -76,7 +76,6 @@ open class BillboardTextFeature(
val mesh = this.mesh ?: return val mesh = this.mesh ?: return
this.mesh = null this.mesh = null
this.info = null this.info = null
if (mesh.state != Mesh.MeshStates.LOADED) return
renderer.renderer.queue += { mesh.unload() } renderer.renderer.queue += { mesh.unload() }
} }

7
src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt
View File

@ -83,8 +83,11 @@ abstract class Mesh(
} }
fun unload() { fun unload() {
check(state == MeshStates.LOADED) { "Can not unload $state mesh!" } when (state) {
buffer.unload() MeshStates.LOADED -> buffer.unload()
MeshStates.PREPARING, MeshStates.FINISHED -> _data?.unload()
else -> throw IllegalStateException("Mesh is already unloaded")
}
state = MeshStates.UNLOADED state = MeshStates.UNLOADED
} }