Merge pull request #39 from PassiveModding/feature/various-fixes

Various fixes

Author: PassiveModding

Meddle/Meddle.Plugin/Services/LayoutService.cs

@@ -358,8 +358,9 @@ public unsafe ParsedInstance[] ParseObjects()
 
         var objects = new Dictionary<nint, ParsedInstance>();
         var mounts = new Dictionary<nint, ParsedCharacterInstance>();
-        foreach (var objectPtr in gameObjectManager->Objects.GameObjectIdSorted)
+        for (var idx = 0; idx < gameObjectManager->Objects.GameObjectIdSorted.Length; idx++)
         {
+            var objectPtr = gameObjectManager->Objects.GameObjectIdSorted[idx];
             if (objectPtr == null || objectPtr.Value == null)
                 continue;
 
@@ -371,10 +372,10 @@ public unsafe ParsedInstance[] ParseObjects()
             var drawObject = obj->DrawObject;
             if (drawObject == null)
                 continue;
-            
+
             if (IsObjectPlaceHolder(drawObject))
                 continue;
-            
+
             var anyVisible = drawObject->IsVisible;
 
             void AddObject(ParsedCharacterInstance instance)
@@ -388,11 +389,12 @@ void AddObject(ParsedCharacterInstance instance)
                     objects.TryAdd(instance.Id, instance);
                 }
             }
-            
+
             var transform = new Transform(drawObject->Position, drawObject->Rotation, drawObject->Scale);
-            var instance = new ParsedCharacterInstance((nint)obj, obj->NameString, type, transform, anyVisible);
+            var name = obj->NameString.GetCharacterName(config, type, idx.ToString());
+            var instance = new ParsedCharacterInstance((nint)obj, name, type, transform, anyVisible);
             AddObject(instance);
-            
+
             if (drawObject->IsVisible == false)
             {
                 // want to list children which are visible even if the parent is not.
@@ -406,25 +408,25 @@ void HandleRecursiveVisibility(Object* childObject)
                         {
                             if (IsCharacterPlaceholder(cBase))
                                 return;
-                            
+
                             var cTransform = new Transform(cBase->DrawObject.Position, cBase->DrawObject.Rotation, cBase->DrawObject.Scale);
-                            var cInstance = new ParsedCharacterInstance((nint)childObject, $"Child of {obj->NameString}", type, cTransform, true,
-                                                                       ParsedCharacterInstance.ParsedCharacterInstanceIdType.CharacterBase)
+                            var cInstance = new ParsedCharacterInstance((nint)childObject, $"Child of {name}", type, cTransform, true,
+                                                                        ParsedCharacterInstance.ParsedCharacterInstanceIdType.CharacterBase)
                             {
                                 Parent = instance
                             };
                             AddObject(cInstance);
                             return; // skip parsing if visible as item should be covered under attaches to parent
                         }
                     }
-                    
+
                     foreach (var childOfChild in childObject->ChildObjects)
                     {
                         if (childOfChild == null) continue;
                         HandleRecursiveVisibility(childOfChild);
                     }
                 }
-                
+
                 foreach (var childObject in drawObject->ChildObjects.GetEnumerator())
                 {
                     HandleRecursiveVisibility(childObject);

Meddle/Meddle.Plugin/UI/Layout/Instance.cs

@@ -65,14 +65,7 @@ private void DrawInstance(ParsedInstance instance, Stack<ParsedInstance> stack,
 
         if (instance is ParsedCharacterInstance ci)
         {
-            if (!string.IsNullOrWhiteSpace(config.PlayerNameOverride) && ci.Kind == ObjectKind.Pc)
-            {
-                infoHeader += $" - {config.PlayerNameOverride}";
-            }
-            else
-            {
-                infoHeader += $" - {ci.Name}";
-            }
+            infoHeader += $" - {ci.Name}";
         }
 
         if (instance is ParsedSharedInstance {Children.Count: > 0} shared)

Meddle/Meddle.Plugin/UI/LiveCharacterTab.cs

@@ -205,7 +205,7 @@ private void DrawCharacter(CSCharacter* character, string name, int depth = 0)
                 }
 
                 return info;
-            }, $"{character->NameString}");
+            }, character->NameString.GetCharacterName(config, character->ObjectKind));
         }
         else
         {
@@ -214,7 +214,7 @@ private void DrawCharacter(CSCharacter* character, string name, int depth = 0)
             genderRace = GenderRace.Unknown;
         }
 
-        DrawDrawObject(drawObject, $"{character->NameString}", customizeData, customizeParams, genderRace);
+        DrawDrawObject(drawObject, character->NameString.GetCharacterName(config, character->ObjectKind), customizeData, customizeParams, genderRace);
 
         try
         {
@@ -243,7 +243,7 @@ private void DrawCharacter(CSCharacter* character, string name, int depth = 0)
                 {
                     ImGui.Separator();
                     ImGui.Text($"Weapon {weaponIdx}");
-                    DrawDrawObject(weaponData.DrawObject, $"{character->NameString}_Weapon", null, null, GenderRace.Unknown);
+                    DrawDrawObject(weaponData.DrawObject, $"{character->NameString.GetCharacterName(config, character->ObjectKind)}_Weapon", null, null, GenderRace.Unknown);
                 }
             }
         }
@@ -285,7 +285,7 @@ private void DrawExportSettings(ParsedCharacterInfo characterInfo, string name)
         if (!ImGui.BeginPopup("ExportSettingsPopup", ImGuiWindowFlags.AlwaysAutoResize)) return;
         try
         {
-            if (UiUtil.DrawExportConfig(config.ExportConfig))
+            if (UiUtil.DrawExportConfig(config.ExportConfig, UiUtil.ExportConfigDrawFlags.HideLayoutOptions))
             {
                 config.Save();
             }

Meddle/Meddle.Plugin/Utils/ExportUtil.cs

@@ -28,7 +28,9 @@ public static void SaveAsType(this ModelRoot? gltf, ExportType typeFlags, string
 
         if (typeFlags.HasFlag(ExportType.OBJ))
         {
-            gltf?.SaveAsWavefront(Path.Combine(path, name + ".obj"));
+            // sanitize obj name
+            var objName = name.Replace(" ", "_");
+            gltf?.SaveAsWavefront(Path.Combine(path, objName + ".obj"));
         }
     }
 

Meddle/Meddle.Plugin/Utils/UIUtil.cs

@@ -2,6 +2,7 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
 using FFXIVClientStructs.FFXIV.Client.Game.Character;
+using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.Interop;
 using ImGuiNET;
@@ -640,4 +641,19 @@ private static void DrawBoneTree(ParsedPartialSkeleton partial, ParsedHkaPose po
     /// <summary> Square stores its colors as BGR values so R and B need to be shuffled and Alpha set to max. </summary>
     public static uint SeColorToRgba(uint color)
         => ((color & 0xFF) << 16) | ((color >> 16) & 0xFF) | (color & 0xFF00) | 0xFF000000;
+
+    public static string GetCharacterName(this string? name, Configuration config, ObjectKind kind, string? suffix = null)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            return $"Unknown{suffix}";
+        }
+        
+        if (!string.IsNullOrWhiteSpace(config.PlayerNameOverride) && kind == ObjectKind.Pc)
+        {
+            return $"{config.PlayerNameOverride}{suffix}";
+        }
+
+        return name;
+    }
 }