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

world renderer: fix some locking issues

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

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

@ -227,7 +227,7 @@ class WorldRenderer(
culledQueue.remove(item.chunkPosition, item.sectionHeight, false) culledQueue.remove(item.chunkPosition, item.sectionHeight, false)
meshingQueue.remove(item) meshingQueue.remove(item, false)
loadingQueue.abort(item.chunkPosition, false) loadingQueue.abort(item.chunkPosition, false)

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

@ -55,7 +55,6 @@ class CulledQueue(
if (lock) this.lock.lock() if (lock) this.lock.lock()
this.queue.clear() this.queue.clear()
if (lock) this.lock.unlock() if (lock) this.lock.unlock()
} }
fun remove(position: ChunkPosition, lock: Boolean) { fun remove(position: ChunkPosition, lock: Boolean) {
@ -108,9 +107,10 @@ class CulledQueue(
queueIterator.remove() queueIterator.remove()
} }
} }
world.chunks.lock.release()
lock.release() lock.release()
world.chunks.lock.acquire()
return list return list
} }

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

@ -129,12 +129,12 @@ class ChunkMeshingQueue(
} }
fun remove(item: WorldQueueItem) { fun remove(item: WorldQueueItem, lock: Boolean) {
this.lock.lock() if (lock) this.lock.lock()
if (this.set.remove(item)) { if (this.set.remove(item)) {
this.queue -= item this.queue -= item
} }
this.lock.unlock() if (lock) this.lock.unlock()
} }