mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-10 15:14:55 +00:00
More adjustments
This commit is contained in:
parent
553fe25df5
commit
e3a410a75a
8 changed files with 31 additions and 3 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -511,10 +511,35 @@ namespace BrawlboxHelper
|
|||
return fska;
|
||||
}
|
||||
|
||||
private static string NameConverterMkWii2Mk8(string name)
|
||||
{
|
||||
switch (name)
|
||||
{
|
||||
case "skl_root": return "Skl_Root";
|
||||
case "leg_l1": return "LegL";
|
||||
case "leg_l2": return "KneeL";
|
||||
case "ankle_l1": return "FootL";
|
||||
case "leg_r1": return "LegR";
|
||||
case "leg_r2": return "KneeR";
|
||||
case "ankle_r1": return "FootR";
|
||||
case "spin": return "Spine1";
|
||||
case "arm_l1": return "ShoulderL";
|
||||
case "arm_l2": return "ArmL";
|
||||
case "wrist_l1": return "HandL";
|
||||
case "arm_r1": return "ShoulderR";
|
||||
case "arm_r2": return "ArmR";
|
||||
case "wrist_r1": return "HandR";
|
||||
case "face_1": return "Head";
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
private static BoneAnim Chr0Entry2BoneAnim(CHR0EntryNode entry)
|
||||
{
|
||||
BoneAnim boneAnim = new BoneAnim();
|
||||
boneAnim.Name = entry.Name;
|
||||
// boneAnim.Name = NameConverterMkWii2Mk8(boneAnim.Name);
|
||||
|
||||
if (entry.UseModelTranslate)
|
||||
boneAnim.FlagsBase |= BoneAnimFlagsBase.Translate;
|
||||
|
|
|
@ -271,7 +271,7 @@ namespace Bfres.Structs
|
|||
}
|
||||
else if (ext == ".chr0")
|
||||
{
|
||||
FromChr0(FileName);
|
||||
FromChr0(FileName, resFileU != null);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -879,9 +879,9 @@ namespace Bfres.Structs
|
|||
}
|
||||
}
|
||||
|
||||
public void FromChr0(string FileName)
|
||||
public void FromChr0(string FileName, bool IsWiiU)
|
||||
{
|
||||
if (SkeletalAnimU != null)
|
||||
if (IsWiiU)
|
||||
{
|
||||
var SkeletalAnimNX = BrawlboxHelper.FSKAConverter.Chr02Fska(FileName);
|
||||
SkeletalAnimU = ConvertSwitchToWiiU(SkeletalAnimNX);
|
||||
|
@ -896,6 +896,8 @@ namespace Bfres.Structs
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void CreateCurveData(AnimCurve curve, List<SEAnimFrame> keys)
|
||||
{
|
||||
for (int k = 0; k < keys.Count; k++)
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -274,6 +274,7 @@ namespace Switch_Toolbox.Library
|
|||
|
||||
bool IsBone = boneNames.Contains(node.Name) && !boneNames.Contains(ParentArmatureName) ||
|
||||
node.Name.Contains("Skl_Root") || node.Name.Contains("nw4f_root") ||
|
||||
node.Name.Contains("skl_root") || node.Name.Contains("_root") ||
|
||||
node.Name.Contains("skeleton_root");
|
||||
|
||||
short SmoothIndex = 0;
|
||||
|
|
Loading…
Reference in a new issue