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

Some fixes for renderable textures

Browse Source
This commit is contained in:
KillzXGaming 2019-06-27 20:58:54 -04:00
parent c52556e8e1
commit 1b72ac47f1
6 changed files with 8 additions and 6 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.

2
Switch_FileFormatsMain/FileFormats/Audio/Archives/BARS.cs
View File

@ -227,7 +227,7 @@ namespace FirstPlugin
bars = new BarsLib.BARS(stream);
if (bars.AmtaList.Count > 0)
Nodes.Add("AMTA");
Nodes.Add("Meta Data");
if (bars.audioList.Count > 0)
Nodes.Add("Audio");

8
Switch_Toolbox_Library/Generics/RenderableTex.cs
View File

@ -147,7 +147,7 @@ namespace Switch_Toolbox.Library.Rendering
//While shaders could prevent this, converting is easier and works fine across all editors
if (Runtime.UseDirectXTexDecoder)
{
ImageData.Add(STGenericTexture.DecodeBlock(ImageData[0],
ImageData[0] = (STGenericTexture.DecodeBlock(ImageData[0],
GenericTexture.Width,
GenericTexture.Height,
GenericTexture.Format,
@ -164,7 +164,7 @@ namespace Switch_Toolbox.Library.Rendering
case TEX_FORMAT.BC5_SNORM:
pixelInternalFormat = PixelInternalFormat.CompressedRgRgtc2;
ImageData.Add(DDSCompressor.DecompressBC5(ImageData[0],
ImageData[0] = (DDSCompressor.DecompressBC5(ImageData[0],
(int)GenericTexture.Width, (int)GenericTexture.Height, true, true));
pixelInternalFormat = PixelInternalFormat.Rgba;
pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba;
@ -195,11 +195,11 @@ namespace Switch_Toolbox.Library.Rendering
default:
if (Runtime.UseDirectXTexDecoder)
{
ImageData.Add(STGenericTexture.DecodeBlock(ImageData[0],
ImageData[0] = STGenericTexture.DecodeBlock(ImageData[0],
GenericTexture.Width,
GenericTexture.Height,
GenericTexture.Format,
GenericTexture.PlatformSwizzle));
GenericTexture.PlatformSwizzle);
pixelInternalFormat = PixelInternalFormat.Rgba;
pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba;

4
Switch_Toolbox_Library/Generics/STSkeleton.cs
View File

@ -183,9 +183,11 @@ namespace Switch_Toolbox.Library
{
CheckBuffers();
if (!Runtime.OpenTKInitialized || !Runtime.renderBones)
if (!Runtime.OpenTKInitialized || !Runtime.renderBones || !Visible)
return;
Console.WriteLine($"SKEL Visible " + Visible);
SF.Shader shader = OpenTKSharedResources.shaders["BONE"];
shader.UseProgram();