diff --git a/File_Format_Library/FileFormats/Archives/Sonic Racing/SWU.cs b/File_Format_Library/FileFormats/Archives/Sonic Racing/SWU.cs index 5a362699..4be30f23 100644 --- a/File_Format_Library/FileFormats/Archives/Sonic Racing/SWU.cs +++ b/File_Format_Library/FileFormats/Archives/Sonic Racing/SWU.cs @@ -240,7 +240,7 @@ namespace FirstPlugin throw new NotImplementedException("Cannot set image data! Operation not implemented!"); } - public override byte[] GetImageData(int ArrayLevel = 0, int MipLevel = 0) + public override byte[] GetImageData(int ArrayLevel = 0, int MipLevel = 0, int DepthLevel = 0) { if (GX2Surface != null) { diff --git a/File_Format_Library/YAML/YamlFscn.cs b/File_Format_Library/YAML/YamlFscn.cs index bbf13fca..fd38fca2 100644 --- a/File_Format_Library/YAML/YamlFscn.cs +++ b/File_Format_Library/YAML/YamlFscn.cs @@ -129,6 +129,7 @@ namespace FirstPlugin animCurve.Keys[i, 1] = Delta; } + animCurve.StartFrame = animCurve.Frames.Max(); animCurve.EndFrame = animCurve.Frames.Max(); if (animCurve.Keys.Length > 1) animCurve.Delta = values[values.Count - 1] - values[0]; diff --git a/Switch_Toolbox_Library/Rendering/GenericModelRenderer/GenericModelRenderer.cs b/Switch_Toolbox_Library/Rendering/GenericModelRenderer/GenericModelRenderer.cs index 2c1cb370..7d1b5ae1 100644 --- a/Switch_Toolbox_Library/Rendering/GenericModelRenderer/GenericModelRenderer.cs +++ b/Switch_Toolbox_Library/Rendering/GenericModelRenderer/GenericModelRenderer.cs @@ -414,6 +414,8 @@ namespace Toolbox.Library.Rendering public void DrawModel(GLControl control, STSkeleton Skeleton, STGenericMaterial Material, STGenericObject m, ShaderProgram shader) { + GL.PushAttrib(AttribMask.ColorBufferBit); + if (m.PolygonGroups.Count > 0) { foreach (var group in m.PolygonGroups) @@ -473,6 +475,7 @@ namespace Toolbox.Library.Rendering } } + GL.PopAttrib(); } private static void DrawModelWireframe(STGenericObject p, ShaderProgram shader) diff --git a/Toolbox/Lib/SPICA.Rendering.dll b/Toolbox/Lib/SPICA.Rendering.dll new file mode 100644 index 00000000..4681f5fb Binary files /dev/null and b/Toolbox/Lib/SPICA.Rendering.dll differ diff --git a/Toolbox/Lib/SPICA.Rendering.pdb b/Toolbox/Lib/SPICA.Rendering.pdb new file mode 100644 index 00000000..f913a3e0 Binary files /dev/null and b/Toolbox/Lib/SPICA.Rendering.pdb differ diff --git a/Toolbox/Lib/SPICA.dll b/Toolbox/Lib/SPICA.dll new file mode 100644 index 00000000..545b3cf4 Binary files /dev/null and b/Toolbox/Lib/SPICA.dll differ diff --git a/Toolbox/Lib/SPICA.pdb b/Toolbox/Lib/SPICA.pdb new file mode 100644 index 00000000..1f15f7a5 Binary files /dev/null and b/Toolbox/Lib/SPICA.pdb differ diff --git a/Toolbox/Lib/yaz0_x86.dll b/Toolbox/Lib/yaz0_x86.dll new file mode 100644 index 00000000..5e85e156 Binary files /dev/null and b/Toolbox/Lib/yaz0_x86.dll differ diff --git a/Toolbox/Toolbox.csproj b/Toolbox/Toolbox.csproj index bc4d5d39..0d79113e 100644 --- a/Toolbox/Toolbox.csproj +++ b/Toolbox/Toolbox.csproj @@ -509,6 +509,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -542,6 +548,7 @@ PreserveNewest + PreserveNewest