Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-22 04:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix v10 bfres that have more than 64 boolean bits to load. Keep original bind indices on replace if possible.

Browse source 
This will fully fix and support v10 bfres by loading all possible boolean bits for the shader options. Previously would only load the first 64 bits using a uint64 value rather than checking for multiple when value is larger.
This commit is contained in:
KillzXGaming 2023-10-21 17:40:00 -04:00
parent 7e5b80e575
commit 6088d66e4a
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll
View file

Binary file not shown.

21
File_Format_Library/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs
View file

@ -890,6 +890,7 @@ namespace Bfres.Structs
{
List<FSHP> Matches = shapes.Where(p => String.Equals(p.Text,
ImportedObjects[i].ObjectName, StringComparison.CurrentCulture)).ToList();
ImportedObjects[i].BoneIndex = 0;
if (Matches != null && Matches.Count > 0)
{
@ -902,6 +903,11 @@ namespace Bfres.Structs
if (settings.LimitSkinCount)
ImportedObjects[i].VertexSkinCount = ((FSHP)Matches[0]).VertexSkinCount;
//Keep original bone mapping by default
//Only do this for original boneset for now
if (!settings.ImportBones)
ImportedObjects[i].BoneIndex = ((FSHP)Matches[0]).BoneIndex;
if (settings.UseOriginalAttributes)
{
AttributeMatcher.Add(ImportedObjects[i].ObjectName, Matches[0].vertexAttributes);
@ -1325,23 +1331,14 @@ namespace Bfres.Structs
else
shape.VertexSkinCount = obj.GetMaxSkinInfluenceCount();
if (shape.VertexSkinCount == 0 && obj.boneList.Count > 0)
{
int boneIndex = Skeleton.bones.FindIndex(x => x.Text == obj.boneList[0]);
if (boneIndex != -1)
shape.BoneIndex = boneIndex;
}
else if (shape.VertexSkinCount == 1 && shape.BoneIndices.Count > 0)
{
int boneIndex = shape.BoneIndices[0];
shape.BoneIndex = boneIndex;
}
shape.CreateNewBoundingBoxes(this);
shape.OptmizeAttributeFormats();
shape.SaveShape(IsWiiU);
shape.SaveVertexBuffer(IsWiiU);
if (shape.Shape != null)
shape.Shape.BoneIndex = (ushort)shape.BoneIndex;
if (IsWiiU)
{
shape.ShapeU.SubMeshBoundingIndices = new List<ushort>();

BIN
Toolbox/Lib/Syroot.NintenTools.NSW.Bfres.dll
View file

Binary file not shown.