loading state work

docs/src/progress/renderertodo.md

@@ -2016,6 +2016,7 @@ Fix memory leaks
 (05/28/2025)
 Server entities without collidables deactivate gravity trees
 Fix texture map for lod human model
+Properly show loading state when waiting on character list
 
 
 

src/main/java/electrosphere/client/entity/character/ClientCharacterManager.java

@@ -10,6 +10,11 @@ public class ClientCharacterManager {
      */
     ClientCharacterListDTO characterList;
 
+    /**
+     * Tracks whether we're waiting on the character list or not
+     */
+    private boolean waitingOnList = true;
+
     /**
      * Gets the character list
      * @return The character list
@@ -26,5 +31,24 @@ public class ClientCharacterManager {
         this.characterList = characterList;
     }
 
+    /**
+     * Checks whether we're waiting on the character list or not
+     * @return true if we're waiting, false otherwise
+     */
+    public boolean isWaitingOnList() {
+        return waitingOnList;
+    }
+
+    /**
+     * Sets whether we're waiting on the character list or not
+     * @param waitingOnList true if we're waiting, false otherwise
+     */
+    public void setWaitingOnList(boolean waitingOnList) {
+        this.waitingOnList = waitingOnList;
+    }
+
+
+    
+    
 
 }

src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java

@@ -90,6 +90,20 @@ public class ClientLoading {
             } catch (InterruptedException ex) {}
             framesWaited++;
         }
+        WindowUtils.updateLoadingWindow("Waiting on characters");
+        framesWaited = 0;
+        while(Globals.clientState.clientCharacterManager.isWaitingOnList()){
+            if(framesWaited % LORE_RESEND_FRAMES == (LORE_RESEND_FRAMES - 1)){
+                //request playable races
+                Globals.clientState.clientConnection.queueOutgoingMessage(LoreMessage.constructRequestRacesMessage());
+                //request characters available to this player
+                Globals.clientState.clientConnection.queueOutgoingMessage(CharacterMessage.constructRequestCharacterListMessage());
+            }
+            try {
+                TimeUnit.MILLISECONDS.sleep(5);
+            } catch (InterruptedException ex) {}
+            framesWaited++;
+        }
         //once we have them, bring up the character creation interface
         //init character creation window
         //eventually should replace with at ui to select an already created character or create a new one
@@ -107,6 +121,9 @@ public class ClientLoading {
     }
 
 
+    /**
+     * Loads the client's world data
+     */
     protected static void loadClientWorld(Object[] params){
         Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION, () -> {
             WindowUtils.closeWindow(WindowStrings.WINDOW_MENU_MAIN);

src/main/java/electrosphere/net/client/protocol/CharacterProtocol.java

@@ -35,6 +35,7 @@ public class CharacterProtocol implements ClientProtocolTemplate<CharacterMessag
             } break;
             case RESPONSECHARACTERLIST: {
                 Globals.clientState.clientCharacterManager.setCharacterList(new Gson().fromJson(message.getdata(), ClientCharacterListDTO.class));
+                Globals.clientState.clientCharacterManager.setWaitingOnList(false);
                 Globals.engineState.signalSystem.post(SignalType.UI_MODIFICATION,() -> {
                     WindowUtils.replaceMainMenuContents(MenuCharacterCreation.createCharacterSelectionWindow());
                 });