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

Default bc7 compression mode to fast

Browse source
This commit is contained in:
KillzXGaming 2019-05-20 18:22:25 -04:00
parent cedaac5518
commit 0536f1a225
8 changed files with 37 additions and 5 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.

11
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL.cs
View file

@ -611,6 +611,9 @@ namespace Bfres.Structs
Cursor.Current = Cursors.WaitCursor;
bool ForceSkinInfluence = false;
int ForceSkinInfluenceMax = 4;
foreach (STGenericObject obj in csvModel.objects)
{
FSHP shape = new FSHP();
@ -625,7 +628,7 @@ namespace Bfres.Structs
shape.Text = obj.ObjectName;
shape.lodMeshes = obj.lodMeshes;
shape.CreateNewBoundingBoxes();
shape.CreateBoneList(obj, this);
shape.CreateBoneList(obj, this, ForceSkinInfluence, ForceSkinInfluenceMax);
shape.CreateIndexList(obj, this);
shape.ApplyImportSettings(csvsettings, GetMaterial(shape.MaterialIndex));
shape.BoneIndices = shape.GetIndices(Skeleton);
@ -925,6 +928,10 @@ namespace Bfres.Structs
Console.WriteLine("Processing Data. Object count " + assimp.objects.Count);
bool ForceSkinInfluence = true;
int ForceSkinInfluenceMax = 4;
int curShp = 0;
foreach (STGenericObject obj in assimp.objects)
{
@ -970,7 +977,7 @@ namespace Bfres.Structs
progressBar.Task = $"Creating Bone list. Mesh: {obj.ObjectName}";
progressBar.Refresh();
shape.CreateBoneList(obj, this);
shape.CreateBoneList(obj, this, ForceSkinInfluence, ForceSkinInfluenceMax);
progressBar.Task = $"Creating Index list. Mesh: {obj.ObjectName}";
progressBar.Refresh();

29
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs
View file

@ -707,7 +707,7 @@ namespace Bfres.Structs
Cursor.Current = Cursors.WaitCursor;
VertexBufferIndex = obj.VertexBufferIndex;
vertices = obj.vertices;
CreateBoneList(obj, (FMDL)Parent.Parent);
CreateBoneList(obj, (FMDL)Parent.Parent, false);
CreateIndexList(obj, (FMDL)Parent.Parent);
VertexSkinCount = obj.GetMaxSkinInfluenceCount();
vertexAttributes = settings.CreateNewAttributes();
@ -756,7 +756,7 @@ namespace Bfres.Structs
}
}
}
public void CreateBoneList(STGenericObject ob, FMDL mdl)
public void CreateBoneList(STGenericObject ob, FMDL mdl, bool ForceSkinCount, int ForcedSkinAmount = 4)
{
if (mdl.Skeleton.Node_Array == null)
mdl.Skeleton.Node_Array = new int[0];
@ -774,6 +774,19 @@ namespace Bfres.Structs
List<string> BonesNotMatched = new List<string>();
if (ForceSkinCount && !ob.HasIndices)
{
var attributeIndex = new FSHP.VertexAttribute();
attributeIndex.Format = ResGFX.AttribFormat.Format_8_8_8_8_UInt;
attributeIndex.Name = "_i0";
vertexAttributes.Add(attributeIndex);
var attributeWeight = new FSHP.VertexAttribute();
attributeWeight.Format = ResGFX.AttribFormat.Format_32_32_32_32_Single;
attributeWeight.Name = "_w0";
vertexAttributes.Add(attributeWeight);
}
int vtxIndex = 0;
foreach (Vertex v in ob.vertices)
{
@ -822,6 +835,18 @@ namespace Bfres.Structs
}
}
if (ForceSkinCount)
{
for (int i = 0; i < ForcedSkinAmount; i++)
{
if (v.boneIds.Count < ForcedSkinAmount)
{
v.boneIds.Add(0);
v.boneWeights.Add(1);
}
}
}
vtxIndex++;
}

2
Switch_FileFormatsMain/GUI/TextureUI/Importers/BNTX/BinaryTextureImporterList.cs
View file

@ -85,7 +85,7 @@ namespace FirstPlugin
compressionModeCB.SelectedIndex = 1;
compressionModeCB.SelectedIndex = 0;
compressionModeCB.Enabled = false;

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.