FLVER2 static update

Shadowth117 · Oct 7, 2023 · 922f93a · 922f93a
1 parent 614cd04
commit 922f93a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/AquaModelLibrary/Extra/SoulsConvert.cs b/AquaModelLibrary/Extra/SoulsConvert.cs
@@ -903,6 +903,12 @@ public static AquaObject FlverToAqua(IFlver flver, out AquaNode aqn, bool useMet
                                         useNormalWTransform = true;
                                     }
                                     break;
+                                case FLVER.LayoutSemantic.BoneIndices:
+                                    foundBoneIndices = true;
+                                    break;
+                                case FLVER.LayoutSemantic.BoneWeights:
+                                    foundBoneWeights = true;
+                                    break;
                             }
                         }
                     }
@@ -974,10 +980,20 @@ public static AquaObject FlverToAqua(IFlver flver, out AquaNode aqn, bool useMet
                     {
                         var f2Mesh = (FLVER2.Mesh)mesh;
                         bool useDefaultBoneIndex = false;
-                        if (f2Mesh.Dynamic == 0)
+                        if (f2Mesh.Dynamic == 0 && vert.NormalW < flver.Bones.Count)
                         {
                             boneTransformationIndex = vert.NormalW;
                         }
+                        else if (useIndexNoWeightTransform && vert.BoneIndices[0] != -1 && f2Mesh.Dynamic == 0)
+                        {
+                            if(f2Mesh.BoneIndices?.Count > 0 && f2Mesh.BoneIndices[0] != -1)
+                            {
+                                boneTransformationIndex = f2Mesh.BoneIndices[vert.BoneIndices[0]];
+                            } else
+                            {
+                                boneTransformationIndex = vert.BoneIndices[0];
+                            }
+                        }
                         else if (useDefaultBoneTransform && flver.Bones.Count > f2Mesh.DefaultBoneIndex)
                         {
                             boneTransformationIndex = f2Mesh.DefaultBoneIndex;

diff --git a/AquaModelLibrary/Nova/AAIMethods.cs b/AquaModelLibrary/Nova/AAIMethods.cs
@@ -134,7 +134,14 @@ public static AquaMotion ReadAAI(string filePath)
                     List<NodeOffsetSet> sets = new List<NodeOffsetSet>();
                     for (int j = 0; j < keyNodeCount; j++)
                     {
-                        NodeOffsetSet set = streamReader.Read<NodeOffsetSet>();
+                        NodeOffsetSet set = new NodeOffsetSet() { nodeId = streamReader.Read<ushort>(), offset = streamReader.Read<ushort>()};
+                        if (j < nodes.Count)
+                        {
+                            set.nodeName = nodes[j].name;
+                        } else
+                        {
+                            set.nodeName = $"node_{j}";
+                        }
                         sets.Add(set);
                     }
                     setsList.Add(sets);

diff --git a/AquaModelLibrary/Nova/Structures/NodeOffsetSet.cs b/AquaModelLibrary/Nova/Structures/NodeOffsetSet.cs
@@ -8,6 +8,7 @@ namespace AquaModelLibrary.Nova.Structures
 {
     public struct NodeOffsetSet
     {
+        public string nodeName;
         public ushort nodeId;
         public ushort offset;
     }