CDH UI improvements

Author: Eauldane

.github/workflows/build.yml

@@ -31,17 +31,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: |
-            ./Snowcloak/bin/*
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '10.x'
-      - name: Unit tests (Core + Infrastructure)
-        run: dotnet test Snowcloak.Tests/Snowcloak.Tests.csproj --configuration Release --nologo
+            ./Snowcloak/bin/*

Snowcloak/Interop/Ipc/IpcCallerBrio.cs

@@ -88,29 +88,38 @@ public async Task<bool> DespawnActorAsync(nint address)
         if (!APIAvailable) return false;
         var gameObject = await _dalamudUtilService.CreateGameObjectAsync(address).ConfigureAwait(false);
         if (gameObject == null) return false;
-        _logger.LogDebug("Despawning Brio Actor {actor}", gameObject.Name.TextValue);
-        return await Service.RunOnFrameworkAsync(() => _despawnActor.Invoke(gameObject)).ConfigureAwait(false);
+        return await Service.RunOnFrameworkAsync(() =>
+        {
+            if (!_dalamudUtilService.IsGameObjectPresent(address)) return false;
+            _logger.LogDebug("Despawning Brio Actor {actor}", gameObject.Name.TextValue);
+            return _despawnActor.Invoke(gameObject);
+        }).ConfigureAwait(false);
     }
 
     public async Task<bool> ApplyTransformAsync(nint address, WorldData data)
     {
         if (!APIAvailable) return false;
         var gameObject = await _dalamudUtilService.CreateGameObjectAsync(address).ConfigureAwait(false);
         if (gameObject == null) return false;
-        _logger.LogDebug("Applying Transform to Actor {actor}", gameObject.Name.TextValue);
 
-        return await Service.RunOnFrameworkAsync(() => _setModelTransform.Invoke(gameObject,
-            new Vector3(data.PositionX, data.PositionY, data.PositionZ),
-            new Quaternion(data.RotationX, data.RotationY, data.RotationZ, data.RotationW),
-            new Vector3(data.ScaleX, data.ScaleY, data.ScaleZ), false)).ConfigureAwait(false);
+        return await Service.RunOnFrameworkAsync(() =>
+        {
+            if (!_dalamudUtilService.IsGameObjectPresent(address)) return false;
+            _logger.LogDebug("Applying Transform to Actor {actor}", gameObject.Name.TextValue);
+            return _setModelTransform.Invoke(gameObject,
+                new Vector3(data.PositionX, data.PositionY, data.PositionZ),
+                new Quaternion(data.RotationX, data.RotationY, data.RotationZ, data.RotationW),
+                new Vector3(data.ScaleX, data.ScaleY, data.ScaleZ), false);
+        }).ConfigureAwait(false);
     }
 
     public async Task<WorldData> GetTransformAsync(nint address)
     {
         if (!APIAvailable) return default;
         var gameObject = await _dalamudUtilService.CreateGameObjectAsync(address).ConfigureAwait(false);
         if (gameObject == null) return default;
-        var data = await Service.RunOnFrameworkAsync(() => _getModelTransform.Invoke(gameObject)).ConfigureAwait(false);
+        var data = await Service.RunOnFrameworkAsync(() =>
+            _dalamudUtilService.IsGameObjectPresent(address) ? _getModelTransform.Invoke(gameObject) : default).ConfigureAwait(false);
         if (data.Item1 == null || data.Item2 == null || data.Item3 == null) return default;
 
         return new WorldData()
@@ -133,20 +142,20 @@ public async Task<WorldData> GetTransformAsync(nint address)
         if (!APIAvailable) return null;
         var gameObject = await _dalamudUtilService.CreateGameObjectAsync(address).ConfigureAwait(false);
         if (gameObject == null) return null;
-        _logger.LogDebug("Getting Pose from Actor {actor}", gameObject.Name.TextValue);
 
-        return await Service.RunOnFrameworkAsync(() => _getPoseAsJson.Invoke(gameObject)).ConfigureAwait(false);
+        return await Service.RunOnFrameworkAsync(() =>
+            _dalamudUtilService.IsGameObjectPresent(address) ? _getPoseAsJson.Invoke(gameObject) : null).ConfigureAwait(false);
     }
 
     public async Task<bool> SetPoseAsync(nint address, string pose)
     {
         if (!APIAvailable) return false;
         var gameObject = await _dalamudUtilService.CreateGameObjectAsync(address).ConfigureAwait(false);
         if (gameObject == null) return false;
-        _logger.LogDebug("Setting Pose to Actor {actor}", gameObject.Name.TextValue);
 
         var applicablePose = JsonNode.Parse(pose)!;
-        var currentPose = await Service.RunOnFrameworkAsync(() => _getPoseAsJson.Invoke(gameObject)).ConfigureAwait(false);
+        var currentPose = await Service.RunOnFrameworkAsync(() =>
+            _dalamudUtilService.IsGameObjectPresent(address) ? _getPoseAsJson.Invoke(gameObject) : null).ConfigureAwait(false);
         if (string.IsNullOrWhiteSpace(currentPose))
         {
             return false;
@@ -160,13 +169,15 @@ public async Task<bool> SetPoseAsync(nint address, string pose)
         }
 
         applicablePose["ModelDifference"] = JsonNode.Parse(modelDifference.ToJsonString());
-
-        await Service.RunOnFrameworkAsync(() =>
+        
+        return await Service.RunOnFrameworkAsync(() =>
         {
+            if (!_dalamudUtilService.IsGameObjectPresent(address)) return false;
+            _logger.LogDebug("Setting Pose to Actor {actor}", gameObject.Name.TextValue);
             _freezeActor.Invoke(gameObject);
             _freezePhysics.Invoke();
+            return _loadPoseFromJson.Invoke(gameObject, applicablePose.ToJsonString(), false);
         }).ConfigureAwait(false);
-        return await Service.RunOnFrameworkAsync(() => _loadPoseFromJson.Invoke(gameObject, applicablePose.ToJsonString(), false)).ConfigureAwait(false);
     }
 
     public void Dispose()

Snowcloak/Services/CharaData/CharaDataApplicationService.cs

@@ -331,7 +331,9 @@ private async Task RevertExistingAsync(GameObjectHandler tempHandler)
         LogRevertingChara(Logger, tempHandler.Name);
         bool reverted = await _characterHandler.RevertHandledChara(tempHandler.Name).ConfigureAwait(false);
         if (reverted)
-            await Task.Delay(TimeSpan.FromSeconds(3)).ConfigureAwait(false);
+        {
+            await ObjectTableCache.WaitWhileCharacterIsDrawing(Logger, tempHandler, Guid.NewGuid()).ConfigureAwait(false);
+        }
     }
 
     private async Task<Guid?> ApplyAppearanceAsync(Guid applicationId, GameObjectHandler tempHandler, CharaDataMetaInfoExtendedDto metaInfo,

Snowcloak/Services/CharaData/GposeLobbySession.cs

@@ -174,11 +174,12 @@ public async Task SpawnAndApplyData(GposeLobbyUserData member)
 
     private async Task LeaveGPoseLobbyAsync()
     {
-        var left = await _apiController.GposeLobbyLeave().ConfigureAwait(false);
-        if (!left) return;
+        var lobbyId = CurrentGPoseLobbyId;
+        
+        await _apiController.GposeLobbyLeave().ConfigureAwait(false);
 
-        if (!string.IsNullOrEmpty(CurrentGPoseLobbyId))
-            LastGPoseLobbyId = CurrentGPoseLobbyId;
+        if (!string.IsNullOrEmpty(lobbyId))
+            LastGPoseLobbyId = lobbyId;
 
         ClearLobby(revertCharas: true);
     }

Snowcloak/UI/CharaDataHubDataApplicationTab.cs

@@ -144,7 +144,7 @@ private void DrawTargetStatus()
         if (!_ctx.HasValidGposeTarget)
         {
             ImGuiHelpers.ScaledDummy(3);
-            ElezenImgui.DrawGroupedCenteredColorText("Applying data is only available in GPose with a valid selected GPose target.", ImGuiColors.DalamudYellow, 350);
+            CharaDataHubCard.Warning("Applying data is only available in GPose with a valid selected GPose target.");
         }
     }
 
@@ -172,7 +172,7 @@ private void DrawFavoritesTab()
 
         if (_stateConfigService.Current.FavoriteCodes.Count == 0)
         {
-            ElezenImgui.ColouredWrappedText("You have no favorites added. Add Favorites through the other tabs before you can use this tab.", ImGuiColors.DalamudYellow);
+            CharaDataHubCard.Info("You have no favorites yet. Add favorites from the other tabs to use this one.");
         }
     }
 
@@ -631,10 +631,8 @@ private void DrawLoadedMcdf()
 
     private static void DrawMcdfFailure()
     {
-        ElezenImgui.ColouredWrappedText("Failure to read MCDF file. MCDF file is possibly corrupt. Re-export the MCDF file and try again.",
-            ImGuiColors.DalamudRed);
-        ElezenImgui.ColouredWrappedText("Note: if this is your MCDF, try redrawing yourself, wait and re-export the file. If you received it from someone else have them do the same.",
-            ImGuiColors.DalamudYellow);
+        CharaDataHubCard.Error("Failed to read the MCDF file — it may be corrupt. Re-export it and try again.");
+        CharaDataHubCard.Info("If this is your MCDF, try redrawing yourself, wait a moment, then re-export. If someone sent it to you, ask them to do the same.");
     }
 
     private void DrawMetaInfoCard(CharaDataMetaInfoExtendedDto data, bool canOpen = false)

Snowcloak/UI/CharaDataHubGposeTogetherTab.cs

@@ -44,14 +44,14 @@ public void Draw()
         if (!_charaDataManager.BrioAvailable)
         {
             ImGuiHelpers.ScaledDummy(5);
-            ElezenImgui.DrawGroupedCenteredColorText("BRIO IS MANDATORY FOR GPOSE TOGETHER.", ImGuiColors.DalamudRed);
+            CharaDataHubCard.Error("Brio is required for GPose Together. Install and enable Brio to use this feature.");
             ImGuiHelpers.ScaledDummy(5);
         }
 
         if (!_apiController.IsConnected)
         {
             ImGuiHelpers.ScaledDummy(5);
-            ElezenImgui.DrawGroupedCenteredColorText("CANNOT USE GPOSE TOGETHER WHILE DISCONNECTED FROM THE SERVER.", ImGuiColors.DalamudRed);
+            CharaDataHubCard.Error("GPose Together is unavailable while you are disconnected from the server.");
             ImGuiHelpers.ScaledDummy(5);
         }
 
@@ -61,7 +61,8 @@ public void Draw()
             + "To use GPose together you either create or join a GPose Together Lobby. After you and other people have joined, make sure that everyone is on the same map. "
             + "It is not required for you to be on the same server, DC or instance. Users that are on the same map will be drawn as moving purple wisps in the overworld, so you can easily find each other." + (Environment.NewLine + Environment.NewLine)
             + "Once you are close to each other you can initiate GPose. You must either assign or spawn characters for each of the lobby users. Their own poses and positions to their character will be automatically applied." + Environment.NewLine
-            + "Pose and location data during GPose are updated approximately every few seconds.");
+            + "Pose and location data during GPose are updated approximately every few seconds." + (Environment.NewLine + Environment.NewLine)
+            + "If you delete an actor that is assigned to a user, it will be unassigned automatically. You can also unassign it manually with the trash button before deleting.");
 
         using var disabled = ImRaii.Disabled(!_charaDataManager.BrioAvailable || !_apiController.IsConnected);
 
@@ -76,16 +77,21 @@ public void Draw()
             ImGuiHelpers.ScaledDummy(5);
             ImGui.SetNextItemWidth(250);
             ImGui.InputTextWithHint("##lobbyId", "GPose Lobby ID", ref _joinLobbyId, 30);
-            if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ArrowRight, "Join GPose Together Lobby"))
+            using (ImRaii.Disabled(string.IsNullOrWhiteSpace(_joinLobbyId)))
             {
-                _session.JoinGPoseLobby(_joinLobbyId);
-                _joinLobbyId = string.Empty;
+                if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ArrowRight, "Join GPose Together Lobby"))
+                {
+                    _session.JoinGPoseLobby(_joinLobbyId);
+                    _joinLobbyId = string.Empty;
+                }
             }
             if (!string.IsNullOrEmpty(_session.LastGPoseLobbyId)
                 && ElezenImgui.ShowIconButton(FontAwesomeIcon.LongArrowAltRight, string.Format("Rejoin Last Lobby {0}", _session.LastGPoseLobbyId)))
             {
                 _session.JoinGPoseLobby(_session.LastGPoseLobbyId);
             }
+            ImGuiHelpers.ScaledDummy(5);
+            CharaDataHubCard.Info("Create or join a lobby to start a GPose Together session.");
         }
         else
         {
@@ -108,39 +114,43 @@ public void Draw()
             }
             ElezenImgui.AttachTooltip("Leave the current GPose lobby." + ElezenImgui.TooltipSeparator + "Hold CTRL and click to leave.");
         }
+
+        // Sending data and assigning users only makes sense once you are in a lobby; rendering these
+        // controls disabled (and an empty user list) outside a lobby just reads as broken UI.
+        if (string.IsNullOrEmpty(_session.CurrentGPoseLobbyId))
+            return;
+
         SnowcloakUi.DistanceSeparator();
-        using (ImRaii.Disabled(string.IsNullOrEmpty(_session.CurrentGPoseLobbyId)))
+        if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ArrowUp, "Send Updated Character Data"))
         {
-            if (ElezenImgui.ShowIconButton(FontAwesomeIcon.ArrowUp, "Send Updated Character Data"))
-            {
-                _ = _session.PushCharacterDownloadDto();
-            }
-            ElezenImgui.AttachTooltip("This will send your current appearance, pose and world data to all users in the lobby.");
-            if (!_dalamudUtilService.IsInGpose)
+            _ = _session.PushCharacterDownloadDto();
+        }
+        ElezenImgui.AttachTooltip("This will send your current appearance, pose and world data to all users in the lobby.");
+        if (!_dalamudUtilService.IsInGpose)
+        {
+            ImGuiHelpers.ScaledDummy(5);
+            CharaDataHubCard.Warning("Assigning users to characters is only available in GPose.");
+            ImGuiHelpers.ScaledDummy(5);
+        }
+        SnowcloakUi.DistanceSeparator();
+        ImGui.TextUnformatted("Users In Lobby");
+        var gposeCharas = _dalamudUtilService.GetGposeCharactersFromObjectTable();
+        var self = _dalamudUtilService.GetPlayerCharacter();
+        gposeCharas = gposeCharas.Where(c => c != null && !string.Equals(c.Name.TextValue, self.Name.TextValue, StringComparison.Ordinal)).ToList();
+
+        using (ImRaii.Child("charaChild", new(0, 0), false, ImGuiWindowFlags.AlwaysAutoResize))
+        {
+            ImGuiHelpers.ScaledDummy(3);
+
+            if (!_session.UsersInLobby.Any())
             {
-                ImGuiHelpers.ScaledDummy(5);
-                ElezenImgui.DrawGroupedCenteredColorText("Assigning users to characters is only available in GPose.", ImGuiColors.DalamudYellow, 300);
+                CharaDataHubCard.Info("No other users in the current GPose lobby yet. Share the Lobby ID above to invite people.");
             }
-            SnowcloakUi.DistanceSeparator();
-            ImGui.TextUnformatted("Users In Lobby");
-            var gposeCharas = _dalamudUtilService.GetGposeCharactersFromObjectTable();
-            var self = _dalamudUtilService.GetPlayerCharacter();
-            gposeCharas = gposeCharas.Where(c => c != null && !string.Equals(c.Name.TextValue, self.Name.TextValue, StringComparison.Ordinal)).ToList();
-
-            using (ImRaii.Child("charaChild", new(0, 0), false, ImGuiWindowFlags.AlwaysAutoResize))
+            else
             {
-                ImGuiHelpers.ScaledDummy(3);
-
-                if (!_session.UsersInLobby.Any() && !string.IsNullOrEmpty(_session.CurrentGPoseLobbyId))
-                {
-                    ElezenImgui.DrawGroupedCenteredColorText("No other users in current GPose lobby", ImGuiColors.DalamudYellow);
-                }
-                else
+                foreach (var user in _session.UsersInLobby)
                 {
-                    foreach (var user in _session.UsersInLobby)
-                    {
-                        DrawLobbyUser(user, gposeCharas);
-                    }
+                    DrawLobbyUser(user, gposeCharas);
                 }
             }
         }
@@ -182,7 +192,7 @@ private void DrawLobbyUser(GposeLobbyUserData user,
                     _ = _session.SpawnAndApplyData(user);
                 }
             }
-            ElezenImgui.AttachTooltip("Spawn new actor, apply character data and and assign it to this user." + ElezenImgui.TooltipSeparator + "Note: If the button is grayed out, " +
+            ElezenImgui.AttachTooltip("Spawn new actor, apply character data and assign it to this user." + ElezenImgui.TooltipSeparator + "Note: If the button is grayed out, " +
                                                                                "the user has not sent any character data or you are on the same map, server and instance. If the latter is the case, join a group with that user and assign the character to them.");
 
 
@@ -210,12 +220,15 @@ private void DrawLobbyUser(GposeLobbyUserData user,
 
             ImGui.SameLine();
             ElezenImgui.ShowIcon(FontAwesomeIcon.Running, sameMapAndServer.SameEverything ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudRed);
-            ElezenImgui.AttachTooltip((sameMapAndServer.SameEverything ? "You are in the same instanced area." : "You are not the same instanced area.") + ElezenImgui.TooltipSeparator +
+            ElezenImgui.AttachTooltip((sameMapAndServer.SameEverything ? "You are in the same instanced area." : "You are not in the same instanced area.") + ElezenImgui.TooltipSeparator +
                                           "Note: Users not in your instance, but on the same map, will be drawn as floating wisps." + Environment.NewLine
                                               + "Note: GPose synchronization is not dependent on the current instance, but you will have to spawn a character for the other lobby users.");
 
             using (ImRaii.Disabled(!_dalamudUtilService.IsInGpose))
             {
+                ImGui.AlignTextToFramePadding();
+                ImGui.TextUnformatted("Actor");
+                ImGui.SameLine();
                 ImGui.SetNextItemWidth(200);
                 using (var combo = ImRaii.Combo("##character", string.IsNullOrEmpty(user.AssociatedCharaName) ? "No character assigned" : _ctx.CharaName(user.AssociatedCharaName)))
                 {