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

gui manager: fix multithreading crashes

Browse Source
This commit is contained in:
Bixilon 2022-05-08 14:08:48 +02:00
parent 3f2145d0fd
commit 9d10606f9a
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/GUIManager.kt
View File

@ -16,6 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui
import de.bixilon.kotlinglm.vec2.Vec2d
import de.bixilon.kotlinglm.vec2.Vec2i
import de.bixilon.kutil.cast.CastUtil.unsafeCast
import de.bixilon.kutil.concurrent.lock.simple.SimpleLock
import de.bixilon.kutil.time.TimeUtil
import de.bixilon.minosoft.config.key.KeyActions
import de.bixilon.minosoft.config.key.KeyBinding
@ -45,6 +46,7 @@ class GUIManager(
override val guiRenderer: GUIRenderer,
) : Initializable, InputHandler, GUIElementDrawer, DraggableHandler {
private val elementCache: MutableMap<GUIBuilder<*>, GUIElement> = mutableMapOf()
private var orderLock = SimpleLock()
var elementOrder: MutableList<GUIElement> = mutableListOf()
private val renderWindow = guiRenderer.renderWindow
internal var paused = false
@ -90,16 +92,20 @@ class GUIManager(
}
element.apply()
}
orderLock.acquire()
for (element in elementOrder) {
if (element is LayoutedGUIElement<*>) {
element.element.forceSilentApply()
}
element.apply()
}
orderLock.release()
}
fun draw() {
orderLock.acquire()
val order = elementOrder.reversed()
orderLock.release()
val time = TimeUtil.millis
val tick = time - lastTickTime > ProtocolDefinition.TICK_TIME
if (tick) {
@ -155,7 +161,10 @@ class GUIManager(
}
private fun runForEach(run: (element: GUIElement) -> Boolean): Boolean {
for ((index, element) in elementOrder.toList().withIndex()) {
orderLock.acquire()
val copy = elementOrder.toList()
orderLock.release()
for ((index, element) in copy.withIndex()) {
if (index != 0 && !element.activeWhenHidden) {
continue
}
@ -183,7 +192,10 @@ class GUIManager(
}
private fun runForEachDrag(run: (element: GUIElement) -> Element?): Element? {
for ((index, element) in elementOrder.toList().withIndex()) {
orderLock.acquire()
val copy = elementOrder.toList()
orderLock.release()
for ((index, element) in copy.withIndex()) {
if (index != 0 && !element.activeWhenHidden) {
continue
}
@ -229,13 +241,18 @@ class GUIManager(
if (elementOrder.isEmpty()) {
renderWindow.inputHandler.inputHandler = guiRenderer
}
for ((index, elementEntry) in elementOrder.toList().withIndex()) {
orderLock.acquire()
val copy = elementOrder.toList()
orderLock.release()
for ((index, elementEntry) in copy.withIndex()) {
if (index != 0 && !elementEntry.activeWhenHidden) {
continue
}
elementEntry.onHide()
}
orderLock.lock()
elementOrder.add(0, element)
orderLock.unlock()
element.onOpen()
onMouseMove(guiRenderer.currentMousePosition)
}
@ -252,12 +269,16 @@ class GUIManager(
return
}
orderLock.acquire()
val index = elementOrder.indexOf(element)
orderLock.release()
if (index < 0) {
return
}
element.onClose()
orderLock.lock()
elementOrder.removeAt(index)
orderLock.unlock()
if (index == 0) {
elementOrder.firstOrNull()?.onOpen()
}
@ -277,7 +298,12 @@ class GUIManager(
if (elementOrder.firstOrNull()?.canPop == false) {
return
}
val previous = elementOrder.removeFirstOrNull() ?: return
orderLock.lock()
val previous = elementOrder.removeFirstOrNull()
orderLock.unlock()
if (previous == null) {
return
}
previous.onClose()
if (elementOrder.isEmpty()) {
renderWindow.inputHandler.inputHandler = null
@ -290,6 +316,7 @@ class GUIManager(
fun clear() {
val remaining: MutableList<GUIElement> = mutableListOf()
orderLock.acquire()
for (element in elementOrder) {
if (!element.canPop) {
remaining += element
@ -297,8 +324,11 @@ class GUIManager(
}
element.onClose()
}
orderLock.release()
orderLock.lock()
elementOrder.clear()
elementOrder += remaining
orderLock.unlock()
guiRenderer.popper.clear()
guiRenderer.dragged.element = null
renderWindow.inputHandler.inputHandler = null