From 347fd412ce332243c9894a5f561219bc7dd94f4a Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Sat, 19 Oct 2019 17:49:20 -0400 Subject: [PATCH] Scale bones according to preview scale properly --- File_Format_Library/FileFormats/BFRES/BFRES.cs | 1 - File_Format_Library/GUI/BFLYT/LayoutEditor.cs | 2 ++ Toolbox/Shader/Bone.vert | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/File_Format_Library/FileFormats/BFRES/BFRES.cs b/File_Format_Library/FileFormats/BFRES/BFRES.cs index d13eb20a..c928c301 100644 --- a/File_Format_Library/FileFormats/BFRES/BFRES.cs +++ b/File_Format_Library/FileFormats/BFRES/BFRES.cs @@ -779,7 +779,6 @@ namespace FirstPlugin BFRESRender.ModelTransform = MarioCostumeEditor.SetTransform(FileName); BFRESRender.ResFileNode = this; - if (IsWiiU) { LoadFile(new Syroot.NintenTools.Bfres.ResFile(stream)); diff --git a/File_Format_Library/GUI/BFLYT/LayoutEditor.cs b/File_Format_Library/GUI/BFLYT/LayoutEditor.cs index 7edbd77b..0a9ff921 100644 --- a/File_Format_Library/GUI/BFLYT/LayoutEditor.cs +++ b/File_Format_Library/GUI/BFLYT/LayoutEditor.cs @@ -536,6 +536,8 @@ namespace LayoutBXLYT { if (LayoutAnimEditor != null) LayoutAnimEditor.OnAnimationPlaying(); + if (AnimationMode && LayoutPaneEditor != null) + LayoutPaneEditor.ReloadEditor(); } private void stComboBox1_MouseDoubleClick(object sender, MouseEventArgs e) diff --git a/Toolbox/Shader/Bone.vert b/Toolbox/Shader/Bone.vert index 272bfa74..77477171 100644 --- a/Toolbox/Shader/Bone.vert +++ b/Toolbox/Shader/Bone.vert @@ -22,5 +22,5 @@ void main() else position = bone * rotation * vec4((point.xyz - vec3(0, 1, 0)) * scale, 1); } - gl_Position = mtxCam * ModelMatrix * mtxMdl * vec4(position.xyz, 1); + gl_Position = mtxCam * mtxMdl * ModelMatrix * vec4(position.xyz, 1); } \ No newline at end of file