diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 3e7a6050..49a69f3d 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 0a0ac762..4e890eff 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 3dcd45de..259783e8 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs index ee5fd45a..a39a67a7 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs @@ -1027,6 +1027,24 @@ namespace Bfres.Structs } } + //Sort smooth bones + if (v.boneWeights.Count > 0) + { + int j = 0; + + SortedDictionary envelopes = new SortedDictionary(); + for (j = 0; j < v.boneIds.Count; j++) + envelopes.Add(v.boneIds[j], v.boneWeights[j]); + + j = 0; + foreach (var envelope in envelopes) + { + v.boneIds[j] = envelope.Key; + v.boneWeights[j] = envelope.Value; + j++; + } + } + if (RigidIds.Count > 0) { foreach (int id in RigidIds) @@ -1238,6 +1256,9 @@ namespace Bfres.Structs } } + + indices.Sort(); + STConsole.WriteLine($"Total Indices for {Text} {indices.Count}"); return indices; diff --git a/Toolbox/GUI/Settings.Designer.cs b/Toolbox/GUI/Settings.Designer.cs index 97f9ebeb..56847b55 100644 --- a/Toolbox/GUI/Settings.Designer.cs +++ b/Toolbox/GUI/Settings.Designer.cs @@ -1233,12 +1233,12 @@ // this.stLabel17.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.stLabel17.Location = new System.Drawing.Point(25, 11); + this.stLabel17.Location = new System.Drawing.Point(3, 3); this.stLabel17.Name = "stLabel17"; - this.stLabel17.Size = new System.Drawing.Size(457, 47); + this.stLabel17.Size = new System.Drawing.Size(495, 55); this.stLabel17.TabIndex = 2; this.stLabel17.Text = "These options can prevent file size restrictions. Check these if you want them t" + - "o be adjusted when a file gets saved. "; + "o be adjusted when a file gets saved. "; // // chkBotwFileTable //