Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-15 17:27:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Now seanim animation imports should work

Browse source
This commit is contained in:
KillzXGaming 2019-05-26 11:48:30 -04:00
parent 3ffc7d7f6d
commit 7bad5175ef
7 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

4
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FSKA.cs
View file

@ -125,7 +125,7 @@ namespace Bfres.Structs
{
STSkeleton skeleton = GetActiveSkeleton();
if (GetResFileU() != null)
if (SkeletalAnimU != null)
BrawlboxHelper.FSKAConverter.Fska2Chr0(ConvertWiiUToSwitch(SkeletalAnimU), FileName);
else
BrawlboxHelper.FSKAConverter.Fska2Chr0(SkeletalAnim, FileName);
@ -278,7 +278,7 @@ namespace Bfres.Structs
{
ska.Name = Text;
if (GetResFileU() != null)
if (SkeletalAnimU != null)
{
SkeletalAnimU = ConvertSwitchToWiiU(ska);
LoadAnim(SkeletalAnimU);

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

5
Switch_Toolbox_Library/FileFormats/Animation/SEANIM.cs
View file

@ -11,10 +11,13 @@ namespace Switch_Toolbox.Library.Animations
var seanim = SEAnim.Read(FileName);
anim.FrameCount = seanim.FrameCount;
anim.CanLoop = seanim.Looping;
foreach (var bone in seanim.Bones)
{
var boneAnim = new Animation.KeyNode(bone);
boneAnim.RotType = Animation.RotationType.EULER;
boneAnim.UseSegmentScaleCompensate = false;
anim.Bones.Add(boneAnim);
if (seanim.AnimationPositionKeys.ContainsKey(bone))
@ -66,7 +69,7 @@ namespace Switch_Toolbox.Library.Animations
}
if (seanim.AnimationScaleKeys.ContainsKey(bone))
{
var scaleKeys = seanim.AnimationRotationKeys[bone];
var scaleKeys = seanim.AnimationScaleKeys[bone];
foreach (SEAnimFrame animFrame in scaleKeys)
{
boneAnim.XSCA.Keys.Add(new Animation.KeyFrame()