From 13810fc09bb7788147a73776ed778cd7133fbad2 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sat, 8 Jul 2023 14:04:14 +0900
Subject: [PATCH] working loading spinner; closing menu while loading will
 gracefully kill the loading thread

---
 .../terrarum/modulebasegame/ui/UILoadList.kt  | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt
index a2303946d..c0cd318f4 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadList.kt
@@ -59,7 +59,12 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
     private val mode1Node = Yaml(UITitleRemoConYaml.injectedMenuSingleCharSel).parse()
 
     private var showSpinner = false
+    private val spinner = CommonResourcePool.getAsTextureRegionPack("inline_loading_spinner")
+    private var spinnerTimer = 0f
+    private var spinnerFrame = 0
+    private val spinnerInterval = 1f / 60
 
+    private lateinit var cellLoadThread: Thread
 
     fun advanceMode() {
         App.printdbg(this, "Load playerUUID: ${UILoadGovernor.playerUUID}, worldUUID: ${UILoadGovernor.worldUUID}")
@@ -107,17 +112,16 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
             playerCells.clear()
 
             try {
-                full.remoCon.handler.lockToggle()
+//                full.remoCon.handler.lockToggle() // lock not needed -- hide() will interrupt the thread
                 showSpinner = true
 
-                Thread {
+                cellLoadThread = Thread {
                     // read savegames
                     var savegamesCount = 0
                     printdbg(this, "============== ${this.hashCode()} ============== ")
                     App.sortedPlayers.forEach { uuid ->
                         printdbg(this, "Reading player $uuid")
 
-
                         val x = full.uiX
                         val y = titleTopGradEnd + cellInterval * savegamesCount
                         try {
@@ -129,12 +133,13 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
                             e.printStackTrace()
                         }
                     }
+
                     printdbg(this, "============== ${this.hashCode()} ============== ")
 
 
-                    full.remoCon.handler.unlockToggle()
+//                    full.remoCon.handler.unlockToggle()
                     showSpinner = false
-                }.start()
+                }.also { it.start() }
 
             }
             catch (e: UninitializedPropertyAccessException) {
@@ -167,6 +172,14 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
                 it.update(delta)
             }
         }
+
+        if (showSpinner) {
+            spinnerTimer += delta
+            while (spinnerTimer > spinnerInterval) {
+                spinnerFrame = (spinnerFrame + 1) % 32
+                spinnerTimer -= spinnerInterval
+            }
+        }
     }
 
     override fun renderUI(batch: SpriteBatch, camera: Camera) {
@@ -238,6 +251,14 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
         savePixmap.dispose()
 
         batch.begin()
+
+        batch.color = Color.WHITE
+        if (showSpinner) {
+            val spin = spinner.get(spinnerFrame % 8, spinnerFrame / 8)
+            val offX = UIRemoCon.menubarOffX - UIRemoCon.UIRemoConElement.paddingLeft + 72 + 1
+            val offY = UIRemoCon.menubarOffY - UIRemoCon.UIRemoConElement.lineHeight * 3 + 16
+            batch.draw(spin, offX.toFloat(), offY.toFloat())
+        }
     }
 
     override fun dispose() {
@@ -293,6 +314,7 @@ class UILoadList(val full: UILoadSavegame) : UICanvas() {
         playerCells.forEach { it.dispose() }
         playerCells.clear()
         showCalled = false
+        cellLoadThread.interrupt()
     }
 
     override fun resize(width: Int, height: Int) {