Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2024-11-12 02:00:50 +01:00
Code Releases Wiki Activity

Ignore rigid indices for now to fix transform issues

Browse Source
This commit is contained in:
KillzXGaming 2019-06-14 21:35:09 -04:00
parent b8cb80727a
commit ad3cd6654b
9 changed files with 3 additions and 14 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.

6
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FSHP.cs
View File

@ -1273,9 +1273,9 @@ namespace Bfres.Structs
Matrix4 trans = Matrix4.Identity;
if (IsSingleBind)
{
bool IsRigidIndex = skel.IsIndexRigid(BoneIndex);
if (!IsRigidIndex)
return position;
// bool IsRigidIndex = skel.IsIndexRigid(BoneIndex);
// if (!IsRigidIndex)
// return position;
if (BoneIndex >= skel.Node_Array.Length || BoneIndex == -1)
{

4
Switch_FileFormatsMain/FileFormats/BFRES/BfresSwitch.cs
View File

@ -336,10 +336,6 @@ namespace FirstPlugin
{
int boneIndex = fshp.BoneIndex;
//Not often but some models use a bone index list instead
if (fshp.BoneIndices.Count > 0)
boneIndex = fshp.BoneIndices[0];
Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, NoBindFix);
v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix);

4
Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs
View File

@ -289,10 +289,6 @@ namespace FirstPlugin
if (model.Skeleton.bones.Count > 0) {
int boneIndex = fshp.BoneIndex;
//Not often but some models use a bone index list instead
if (fshp.BoneIndices.Count > 0)
boneIndex = fshp.BoneIndices[0];
Matrix4 NoBindFix = model.Skeleton.bones[boneIndex].Transform;
v.pos = Vector3.TransformPosition(v.pos, NoBindFix);
v.nrm = Vector3.TransformNormal(v.nrm, NoBindFix);

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.

3
Switch_Toolbox_Library/Swizzling/GX2.cs
View File

@ -773,8 +773,6 @@ namespace Switch_Toolbox.Library
dataOffset += ArrayImageize;
mipDataOffset += ArrayMipImageize;
break;
}
return result;
@ -1160,7 +1158,6 @@ namespace Switch_Toolbox.Library
private static ulong computeSurfaceAddrFromCoordMacroTiled(uint x, uint y, uint bpp, uint pitch, uint height,
AddrTileMode tileMode, uint pipeSwizzle, uint bankSwizzle)
{
uint sampleSlice, numSamples, samplesPerSlice;
uint numSampleSplits, bankSwapWidth, swapIndex;