Weapon attach fixes

PassiveModding · Mar 30, 2024 · 67d79fc · 67d79fc
1 parent bd27be5
commit 67d79fc
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 26 deletions.
diff --git a/Meddle/Meddle.Plugin/Models/Attach.cs b/Meddle/Meddle.Plugin/Models/Attach.cs
@@ -7,7 +7,7 @@ public unsafe class Attach
 {
     public int ExecuteType { get; }
 
-    public Transform OffsetTransform { get; }
+    public Transform? OffsetTransform { get; }
     public byte PartialSkeletonIdx { get; }
     public ushort BoneIdx { get; }
 
@@ -21,15 +21,12 @@ public Attach(CSAttach* attach)
         // 3 => Fashion Accessories
         // 4 => Weapon
         ExecuteType = attach->ExecuteType;
-
-        // TODO: Deconstruct union based on type
-        var att = attach->SkeletonBoneAttachments[0];
-        OffsetTransform = new(att.ChildTransform);
         if (ExecuteType == 0)
             return;
+
 
-        //if (ExecuteType != 4)
-        //    return;
+        var att = attach->SkeletonBoneAttachments[0];
+        OffsetTransform = new(att.ChildTransform);
 
         PartialSkeletonIdx = att.SkeletonIdx;
         BoneIdx = att.BoneIdx;

diff --git a/Meddle/Meddle.Plugin/Services/ExportManager.cs b/Meddle/Meddle.Plugin/Services/ExportManager.cs
@@ -103,7 +103,8 @@ await Task.Run(() =>
                     var child = attachedChildren[i];
                     var attachName = skeleton.PartialSkeletons[child.Attach.PartialSkeletonIdx]
                                               .HkSkeleton!.BoneNames[child.Attach.BoneIdx];
-                    var childInfo = HandleAttachedChild(child, i, attachName, scene, boneMap, rootBone);
+                    var childInfo = HandleAttachedChild(child, i, attachName, scene, boneMap);
+
                     foreach (var model in child.Models)
                     {
                         logger.Debug($"Handling child model {model.Path}");
@@ -166,13 +167,15 @@ private void ExportInternal(
             HandleModel(logger, config, model, character.RaceCode, scene, boneMap, Matrix4x4.Identity,
                         character.CustomizeParameter);
         }, config.ParallelBuild);
-
+        
         for (var i = 0; i < character.AttachedChildren.Count; i++)
         {
             var child = character.AttachedChildren[i];
+            if (child.Attach.ExecuteType != 4) continue;
             var attachName = character.Skeleton.PartialSkeletons[child.Attach.PartialSkeletonIdx]
                                          .HkSkeleton!.BoneNames[child.Attach.BoneIdx];
-            var childInfo = HandleAttachedChild(child, i, attachName, scene, boneMap, rootBone);
+            var childInfo = HandleAttachedChild(child, i, attachName, scene, boneMap);
+
             foreach (var model in child.Models)
             {
                 logger.Debug($"Handling child model {model.Path}");
@@ -241,20 +244,33 @@ private void HandleModel(
                                      int i,
                                      string attachName,
                                      SceneBuilder scene,
-                                     BoneNodeBuilder[]? boneMap, 
-                                     NodeBuilder? rootBone)
+                                     BoneNodeBuilder[]? boneMap)
     {
         var childBoneMap = ModelUtility.GetBoneMap(child.Skeleton, out var childRoot);
         childRoot!.SetSuffixRecursively(i);
 
-        if (rootBone == null || boneMap == null)
+        if (child.Attach.OffsetTransform is { } ct)
+        {
+            // This appears to fix weapon attaches
+            childRoot.WithLocalScale(ct.Scale);
+            childRoot.WithLocalRotation(ct.Rotation);
+            childRoot.WithLocalTranslation(ct.Translation);
+            if (childRoot.AnimationTracksNames.Contains("pose"))
+            {
+                childRoot.UseScale().UseTrackBuilder("pose").WithPoint(0, ct.Scale);
+                childRoot.UseRotation().UseTrackBuilder("pose").WithPoint(0, ct.Rotation);
+                childRoot.UseTranslation().UseTrackBuilder("pose").WithPoint(0, ct.Translation);
+            }
+        }
+
+        var childBone = boneMap?.FirstOrDefault(b => b.BoneName.Equals(attachName, StringComparison.Ordinal));
+        if (childBone == null)
         {
             scene.AddNode(childRoot);
         }
         else
         {
-            var boneTarget = boneMap.First(b => b.BoneName.Equals(attachName, StringComparison.Ordinal));
-            boneTarget.AddNode(childRoot);
+            childBone.AddNode(childRoot);
         }
 
         var transform = Matrix4x4.Identity;

diff --git a/Meddle/Meddle.Plugin/UI/CharacterTab.Cache.cs b/Meddle/Meddle.Plugin/UI/CharacterTab.Cache.cs
@@ -129,19 +129,28 @@ private void DrawAttachView(CharacterTree tree, ref bool[] set, out IExportReque
                 var bone = skeleton.HkSkeleton!.BoneNames[child.Attach.BoneIdx];
 
                 ImGui.TableNextColumn();
-                var check = set[i];
-                if (ImGui.Checkbox($"##{child.GetHashCode()}", ref check))
+
+                // other execute types are a lil broken still
+                if (child.Attach.ExecuteType == 4)
                 {
-                    set[i] = check;
-                }
+                    var check = set[i];
+                    if (ImGui.Checkbox($"##{child.GetHashCode()}", ref check))
+                    {
+                        set[i] = check;
+                    }
 
-                ImGui.SameLine();
+                    ImGui.SameLine();
+                }
 
                 if (ImGui.CollapsingHeader($"Attach at {bone ?? "unknown"}##{child.GetHashCode()}"))
                 {
-                    ImGui.Text($"Position: {child.Attach.OffsetTransform.Translation}");
-                    ImGui.Text($"Rotation: {child.Attach.OffsetTransform.Rotation}");
-                    ImGui.Text($"Scale: {child.Attach.OffsetTransform.Scale}");
+                    if (child.Attach.OffsetTransform is { } ct)
+                    {
+                        ImGui.Text($"Position: {ct.Translation}");
+                        ImGui.Text($"Rotation: {ct.Rotation}");
+                        ImGui.Text($"Scale: {ct.Scale}");
+                    }
+
                     ImGui.Text($"Execute Type: {child.Attach.ExecuteType}");
                     if (DrawExportButton($"Export##{child.GetHashCode()}", ExportManager.IsExporting))
                     {

diff --git a/Meddle/Meddle.Plugin/UI/ObjectTab.cs b/Meddle/Meddle.Plugin/UI/ObjectTab.cs
@@ -165,10 +165,13 @@ private unsafe void DrawCharacterInfo(CSCharacter* character)
                 var bone = skeleton.HkSkeleton!.BoneNames[child.Attach.BoneIdx];
                 if (ImGui.CollapsingHeader($"Attach at {bone ?? "unknown"}##{child.GetHashCode()}"))
                 {
+                    if (child.Attach.OffsetTransform is { } ct)
+                    {
+                        ImGui.Text($"Position: {ct.Translation}");
+                        ImGui.Text($"Rotation: {ct.Rotation}");
+                        ImGui.Text($"Scale: {ct.Scale}");
+                    }
 
-                    ImGui.Text($"Position: {child.Attach.OffsetTransform.Translation}");
-                    ImGui.Text($"Rotation: {child.Attach.OffsetTransform.Rotation}");
-                    ImGui.Text($"Scale: {child.Attach.OffsetTransform.Scale}");
                     ImGui.Text($"Execute Type: {child.Attach.ExecuteType}");
                     using var table = ImRaii.Table("##attachmodels", 1, ImGuiTableFlags.Borders);
                     foreach (var model in child.Models)

diff --git a/Meddle/Meddle.Plugin/Utility/ModelUtility.cs b/Meddle/Meddle.Plugin/Utility/ModelUtility.cs
@@ -1,6 +1,7 @@
 using Meddle.Plugin.Models;
 using Meddle.Plugin.Xande;
 using SharpGLTF.Scenes;
+using SharpGLTF.Transforms;
 
 namespace Meddle.Plugin.Utility;