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

world renderer: fix some locking crashes

Browse Source
This commit is contained in:
Bixilon 2022-12-23 16:35:29 +01:00
parent b8ef770685
commit 6a5e9ab799
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/gui/rendering/world/LoadedMeshes.kt
View File

@ -88,14 +88,17 @@ class LoadedMeshes(
operator fun contains(position: ChunkPosition): Boolean { operator fun contains(position: ChunkPosition): Boolean {
renderer.lock.acquire()
lock.acquire() lock.acquire()
val contains = position in this.meshes val contains = position in this.meshes
lock.release() lock.release()
renderer.lock.release()
return contains return contains
} }
fun collect(visible: VisibleMeshes) { fun collect(visible: VisibleMeshes) {
renderer.lock.acquire()
lock.acquire() lock.acquire()
for ((chunkPosition, meshes) in this.meshes) { for ((chunkPosition, meshes) in this.meshes) {
if (!renderer.visibilityGraph.isChunkVisible(chunkPosition)) { if (!renderer.visibilityGraph.isChunkVisible(chunkPosition)) {
@ -111,6 +114,7 @@ class LoadedMeshes(
} }
} }
lock.release() lock.release()
renderer.lock.release()
} }
fun lock() { fun lock() {

2
src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/CulledQueue.kt
View File

@ -81,6 +81,7 @@ class CulledQueue(
fun collect(): MutableList<Pair<Chunk, Int>> { fun collect(): MutableList<Pair<Chunk, Int>> {
renderer.lock.acquire()
lock.acquire() // The queue method needs the full lock of the culledQueue lock.acquire() // The queue method needs the full lock of the culledQueue
val world = renderer.world val world = renderer.world
@ -112,6 +113,7 @@ class CulledQueue(
world.chunks.lock.release() world.chunks.lock.release()
lock.release() lock.release()
renderer.lock.release()
return list return list

1
src/main/java/de/bixilon/minosoft/gui/rendering/world/queue/meshing/ChunkMeshingQueue.kt
View File

@ -144,6 +144,7 @@ class ChunkMeshingQueue(
fun queue(item: WorldQueueItem) { fun queue(item: WorldQueueItem) {
lock() lock()
// TODO: don't remove and readd
if (set.remove(item)) { if (set.remove(item)) {
queue -= item queue -= item
} }