Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-22 13:20:23 +01:00
Code Releases Wiki Activity

Fix star link SDF

Browse Source
This commit is contained in:
KillzXGaming 2019-06-25 15:58:20 -04:00
parent 51eff3211d
commit 2d1c15a333
8 changed files with 9 additions and 8 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/Archives/SDF.cs
View File

@ -172,8 +172,8 @@ namespace FirstPlugin
byte[] decomp = null; byte[] decomp = null;
if (magic == 0xDFF25B82 || magic == 0xFD2FB528) if (magic == 0xDFF25B82 || magic == 0xFD2FB528)
decomp = STLibraryCompression.ZSTD.Decompress(CompressedBlock); decomp = STLibraryCompression.ZSTD.Decompress(CompressedBlock);
else if (magic == 0x184D2204) else if (magic == 0x184D2204 || header.Version >= 0x17)
decomp = STLibraryCompression.Type_LZ4.Decompress(CompressedBlock); decomp = STLibraryCompression.Type_LZ4.Decompress(CompressedBlock, 0, CompressedBlock.Length,(int)header.DecompressedSize);
else else
decomp = STLibraryCompression.ZLIB.Decompress(CompressedBlock); decomp = STLibraryCompression.ZLIB.Decompress(CompressedBlock);
@ -414,7 +414,7 @@ namespace FirstPlugin
} }
} }
if (Header.Version >= 0x17) if (Header.Version < 0x16) //Unsure. Rabbids doesn't use it, newer versions don't.
{ {
fileId = (long)readVariadicInteger(4, reader); fileId = (long)readVariadicInteger(4, reader);
} }

4
Switch_FileFormatsMain/FileFormats/Collision/KCL.cs
View File

@ -611,14 +611,13 @@ namespace FirstPlugin
Vector3 lightDirection = new Vector3(0f, 0f, -1f); Vector3 lightDirection = new Vector3(0f, 0f, -1f);
Vector3 difLightDirection = Vector3.TransformNormal(lightDirection, invertedCamera).Normalized(); Vector3 difLightDirection = Vector3.TransformNormal(lightDirection, invertedCamera).Normalized();
GL.Enable(EnableCap.Texture2D);
GL.Enable(EnableCap.DepthTest); GL.Enable(EnableCap.DepthTest);
foreach (var model in models) foreach (var model in models)
{ {
if (Runtime.RenderModels && model.Checked && model.Checked) if (Runtime.RenderModels && model.Checked && model.Checked)
{ {
List<int> faces = model.lodMeshes[0].getDisplayFace(); List<int> faces = model.getDisplayFace();
GL.Begin(PrimitiveType.Triangles); GL.Begin(PrimitiveType.Triangles);
foreach (var index in faces) foreach (var index in faces)
@ -626,7 +625,6 @@ namespace FirstPlugin
Vertex vert = model.vertices[index]; Vertex vert = model.vertices[index];
float normal = Vector3.Dot(difLightDirection, vert.nrm) * 0.5f + 0.5f; float normal = Vector3.Dot(difLightDirection, vert.nrm) * 0.5f + 0.5f;
GL.Color3(new Vector3(normal)); GL.Color3(new Vector3(normal));
GL.TexCoord2(vert.uv0);
GL.Vertex3(vert.pos); GL.Vertex3(vert.pos);
} }
GL.End(); GL.End();

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/Interfaces/IArchiveFile.cs
View File

@ -482,8 +482,11 @@ namespace Switch_Toolbox.Library
Extension = FindMatch(archiveFileInfo.FileData); Extension = FindMatch(archiveFileInfo.FileData);
} }
if (ArchiveFileInfo.ExtensionImageKeyLookup != null)
{
if (ArchiveFileInfo.ExtensionImageKeyLookup.ContainsKey(Extension)) if (ArchiveFileInfo.ExtensionImageKeyLookup.ContainsKey(Extension))
SetImageKey(ArchiveFileInfo.ExtensionImageKeyLookup[Extension]); SetImageKey(ArchiveFileInfo.ExtensionImageKeyLookup[Extension]);
}
switch (Extension) switch (Extension)
{ {