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

More render texture improvements. Fix a fix model importing issues.

Browse source
This commit is contained in:
KillzXGaming 2019-06-28 14:58:17 -04:00
parent 1b72ac47f1
commit ade73e6560
15 changed files with 140 additions and 68 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-shm
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

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

@ -1171,10 +1171,11 @@ namespace Bfres.Structs
shape.ApplyImportSettings(settings, GetMaterial(shape.MaterialIndex));
shape.BoneIndices = shape.GetIndices(Skeleton);
if (shape.HasIndices)
shape.VertexSkinCount = obj.GetMaxSkinInfluenceCount();
if (ForceSkinInfluence)
shape.VertexSkinCount = (byte)ForceSkinInfluenceMax;
else
shape.VertexSkinCount = obj.GetMaxSkinInfluenceCount();
if (shape.VertexSkinCount == 1 && shape.BoneIndices.Count > 0)
{

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

@ -969,7 +969,7 @@ namespace Bfres.Structs
}
//Check weights. If they are all 1. If they are then they aren't necessary
if (ob.VertexSkinCount == 1 || ForcedSkinAmount == 1)
if (ob.VertexSkinCount == 1 || ForceSkinCount && ForcedSkinAmount == 1)
{
bool UseWeights = ob.vertices.Any(o => o.boneWeights[0] != 1);
if (!UseWeights)
@ -987,7 +987,7 @@ namespace Bfres.Structs
}
}
bool UseRigidSkiining = ob.VertexSkinCount == 1;
bool UseRigidSkinning = ob.VertexSkinCount == 1;
int vtxIndex = 0;
foreach (Vertex v in ob.vertices)
@ -1008,7 +1008,7 @@ namespace Bfres.Structs
//Add these after smooth matrices
if (nodeRigidIndex[i] != -1)
{
if (UseRigidSkiining)
if (UseRigidSkinning)
RigidIds.Add(nodeRigidIndex[i]);
else
RigidIds.Add(defBn.Index);

2
Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FTEX.cs
View file

@ -597,7 +597,7 @@ namespace Bfres.Structs
var surfaces = GX2.Decode(surf);
if (ArrayLevel >= surfaces.Count)
throw new Exception("Invalid amount of surfaces decoded!");
throw new Exception($"Invalid amount of surfaces decoded! Array Level: {ArrayLevel} Total Arrays: {surfaces.Count} ");
if (surfaces.Count == 0)
throw new Exception("Surfaces came out empty!");

2
Switch_FileFormatsMain/FileFormats/BFRES/BfresSwitch.cs
View file

@ -718,7 +718,7 @@ namespace FirstPlugin
if (Runtime.activeGame == Runtime.ActiveGame.MK8D)
{
if (useSampler == "_a0")
if (useSampler == "_a0" && AlbedoCount == 0)
{
m.HasDiffuseMap = true;
AlbedoCount++;

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.

2
Switch_Toolbox_Library/Forms/Custom/DropdownPanel/STDropDownPanel.cs
View file

@ -28,7 +28,7 @@ namespace Switch_Toolbox.Library.Forms
}
}
public Color SetIconColor
public Color SetIconColor
{
get
{

23
Switch_Toolbox_Library/Generics/GenericTexture.cs
View file

@ -95,18 +95,29 @@ namespace Switch_Toolbox.Library
public abstract byte[] GetImageData(int ArrayLevel = 0, int MipLevel = 0);
public List<Surface> GetSurfaces()
//
//Gets a list of surfaces given the start index of the array and the amount of arrays to obtain
//
public List<Surface> GetSurfaces(int ArrayIndexStart = 0, int ArrayLength = 1 )
{
if (ArrayLength < ArrayCount)
ArrayLength = (int)ArrayCount;
var surfaces = new List<Surface>();
for (int arrayLevel = 0; arrayLevel < ArrayCount; arrayLevel++)
{
List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 0; mipLevel < MipCount; mipLevel++)
bool IsLower = arrayLevel < ArrayIndexStart;
bool IsHigher = arrayLevel > (ArrayIndexStart + ArrayLength);
if (!IsLower && !IsHigher)
{
mips.Add(GetImageData(arrayLevel, mipLevel));
}
List<byte[]> mips = new List<byte[]>();
for (int mipLevel = 0; mipLevel < MipCount; mipLevel++)
{
mips.Add(GetImageData(arrayLevel, mipLevel));
}
surfaces.Add(new Surface() { mipmaps = mips });
surfaces.Add(new Surface() { mipmaps = mips });
}
}
return surfaces;

3
Switch_Toolbox_Library/Interfaces/IArchiveFile.cs
View file

@ -297,10 +297,9 @@ namespace Switch_Toolbox.Library
var rootText = root.Text;
var rootTextLength = rootText.Length;
var nodeFiles = archiveFile.Files;
int I = 0;
foreach (var node in nodeFiles)
foreach (var node in archiveFile.Files)
{
if (!node.CanLoadFile)
continue;

163
Switch_Toolbox_Library/Generics/RenderableTex.cs → Switch_Toolbox_Library/Rendering/RenderableTex.cs
View file

@ -88,6 +88,7 @@ namespace Switch_Toolbox.Library.Rendering
GL.TexParameter(TextureTarget, param, value);
}
private bool UseMipmaps = false;
public void LoadOpenGLTexture(STGenericTexture GenericTexture, int ArrayStartIndex = 0)
{
if (!Runtime.OpenTKInitialized || GLInitialized || Runtime.UseLegacyGL)
@ -98,18 +99,32 @@ namespace Switch_Toolbox.Library.Rendering
if (GenericTexture.ArrayCount == 0)
GenericTexture.ArrayCount = 1;
List<byte[]> ImageData = new List<byte[]>();
for (int i = 0; i < GenericTexture.ArrayCount; i++)
List<STGenericTexture.Surface> Surfaces = new List<STGenericTexture.Surface>();
if (UseMipmaps && GenericTexture.ArrayCount <= 1)
{
if (i >= ArrayStartIndex && i <= ArrayStartIndex + 6) //Only load up to 6 faces
ImageData.Add(GenericTexture.GetImageData(i, 0));
//Load surfaces with mip maps
Surfaces = GenericTexture.GetSurfaces(ArrayStartIndex, 6);
}
if (ImageData.Count == 0 || ImageData[0].Length == 0)
else
{
//Only load first mip level. Will be generated after
for (int i = 0; i < GenericTexture.ArrayCount; i++)
{
if (i >= ArrayStartIndex && i <= ArrayStartIndex + 6) //Only load up to 6 faces
{
Surfaces.Add(new STGenericTexture.Surface()
{
mipmaps = new List<byte[]>() { GenericTexture.GetImageData(i, 0) }
});
}
}
}
if (Surfaces.Count == 0 || Surfaces[0].mipmaps[0].Length == 0)
throw new Exception("Data is empty!");
IsCubeMap = ImageData.Count == 6;
ImageSize = ImageData[0].Length;
IsCubeMap = Surfaces.Count == 6;
ImageSize = Surfaces[0].mipmaps[0].Length;
if (IsCubeMap)
{
@ -147,11 +162,6 @@ namespace Switch_Toolbox.Library.Rendering
//While shaders could prevent this, converting is easier and works fine across all editors
if (Runtime.UseDirectXTexDecoder)
{
ImageData[0] = (STGenericTexture.DecodeBlock(ImageData[0],
GenericTexture.Width,
GenericTexture.Height,
GenericTexture.Format,
GenericTexture.PlatformSwizzle));
pixelInternalFormat = PixelInternalFormat.Rgba;
pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba;
}
@ -162,10 +172,6 @@ namespace Switch_Toolbox.Library.Rendering
}
break;
case TEX_FORMAT.BC5_SNORM:
pixelInternalFormat = PixelInternalFormat.CompressedRgRgtc2;
ImageData[0] = (DDSCompressor.DecompressBC5(ImageData[0],
(int)GenericTexture.Width, (int)GenericTexture.Height, true, true));
pixelInternalFormat = PixelInternalFormat.Rgba;
pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba;
break;
@ -195,25 +201,64 @@ namespace Switch_Toolbox.Library.Rendering
default:
if (Runtime.UseDirectXTexDecoder)
{
ImageData[0] = STGenericTexture.DecodeBlock(ImageData[0],
GenericTexture.Width,
GenericTexture.Height,
GenericTexture.Format,
GenericTexture.PlatformSwizzle);
pixelInternalFormat = PixelInternalFormat.Rgba;
pixelFormat = OpenTK.Graphics.OpenGL.PixelFormat.Rgba;
}
break;
}
GLInitialized = true;
for (int i = 0; i < Surfaces.Count; i++)
{
for (int MipLevel = 0; MipLevel < Surfaces[i].mipmaps.Count; MipLevel++)
{
uint width = Math.Max(1, GenericTexture.Width >> MipLevel);
uint height = Math.Max(1, GenericTexture.Height >> MipLevel);
TexID = GenerateOpenGLTexture(this, ImageData);
Surfaces[i].mipmaps[MipLevel] = DecodeWithoutOpenGLDecoder(Surfaces[i].mipmaps[MipLevel], width, height, GenericTexture);
}
}
ImageData.Clear();
TexID = GenerateOpenGLTexture(this, Surfaces);
Surfaces.Clear();
}
public static int GenerateOpenGLTexture(RenderableTex t, List<byte[]> ImageData)
private byte[] DecodeWithoutOpenGLDecoder(byte[] ImageData, uint width, uint height, STGenericTexture GenericTexture)
{
switch (GenericTexture.Format)
{
case TEX_FORMAT.BC1_UNORM:
case TEX_FORMAT.BC1_UNORM_SRGB:
case TEX_FORMAT.BC2_UNORM:
case TEX_FORMAT.BC2_UNORM_SRGB:
case TEX_FORMAT.BC3_UNORM:
case TEX_FORMAT.BC3_UNORM_SRGB:
case TEX_FORMAT.BC5_UNORM:
case TEX_FORMAT.BC6H_SF16:
case TEX_FORMAT.BC6H_UF16:
case TEX_FORMAT.BC7_UNORM:
case TEX_FORMAT.BC7_UNORM_SRGB:
case TEX_FORMAT.R8G8B8A8_UNORM:
case TEX_FORMAT.R8G8B8A8_UNORM_SRGB:
return ImageData;
case TEX_FORMAT.BC5_SNORM:
return (DDSCompressor.DecompressBC5(ImageData,
(int)width, (int)height, true, true));
default:
if (Runtime.UseDirectXTexDecoder)
{
return STGenericTexture.DecodeBlock(ImageData,
width,
height,
GenericTexture.Format,
GenericTexture.PlatformSwizzle);
}
else
return ImageData;
}
}
public static int GenerateOpenGLTexture(RenderableTex t, List<STGenericTexture.Surface> ImageData)
{
if (!t.GLInitialized)
return -1;
@ -225,60 +270,76 @@ namespace Switch_Toolbox.Library.Rendering
{
if (t.pixelInternalFormat != PixelInternalFormat.Rgba)
{
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveX, ImageData[0]);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeX, ImageData[1]);
for (int mipLevel = 0; mipLevel < ImageData[0].mipmaps.Count; mipLevel++)
{
int width = Math.Max(1, t.width >> mipLevel);
int height = Math.Max(1, t.height >> mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveY, ImageData[2]);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeY, ImageData[3]);
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveX, ImageData[0], width, height, mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeX, ImageData[1], width, height, mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveZ, ImageData[4]);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeZ, ImageData[5]);
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveY, ImageData[2], width, height, mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeY, ImageData[3], width, height, mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapPositiveZ, ImageData[4], width, height, mipLevel);
t.LoadCompressedMips(TextureTarget.TextureCubeMapNegativeZ, ImageData[5], width, height, mipLevel);
}
}
else
{
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveX, ImageData[0]);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeX, ImageData[1]);
for (int mipLevel = 0; mipLevel < ImageData[0].mipmaps.Count; mipLevel++)
{
int width = Math.Max(1, t.width >> mipLevel);
int height = Math.Max(1, t.height >> mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveY, ImageData[2]);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeY, ImageData[3]);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveX, ImageData[0], width, height, mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeX, ImageData[1], width, height, mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveZ, ImageData[4]);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeZ, ImageData[5]);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveY, ImageData[2], width, height, mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeY, ImageData[3], width, height, mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapPositiveZ, ImageData[4], width, height, mipLevel);
t.LoadUncompressedMips(TextureTarget.TextureCubeMapNegativeZ, ImageData[5], width, height, mipLevel);
}
}
if (ImageData[0].mipmaps.Count == 1)
GL.GenerateMipmap(GenerateMipmapTarget.TextureCubeMap);
}
else
{
if (t.pixelInternalFormat != PixelInternalFormat.Rgba)
{
GL.CompressedTexImage2D<byte>(TextureTarget.Texture2D, 0, (InternalFormat)t.pixelInternalFormat,
t.width, t.height, 0, getImageSize(t), ImageData[0]);
//Debug.WriteLine(GL.GetError());
for (int mipLevel = 0; mipLevel < ImageData[0].mipmaps.Count; mipLevel++)
t.LoadCompressedMips(t.TextureTarget, ImageData[0], t.width, t.height, mipLevel);
}
else
{
GL.TexImage2D<byte>(TextureTarget.Texture2D, 0, t.pixelInternalFormat, t.width, t.height, 0,
t.pixelFormat, PixelType.UnsignedByte, ImageData[0]);
for (int mipLevel = 0; mipLevel < ImageData[0].mipmaps.Count; mipLevel++)
t.LoadUncompressedMips(t.TextureTarget, ImageData[0], t.width, t.height, mipLevel);
}
GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
if (ImageData[0].mipmaps.Count == 1)
GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
}
return texID;
}
private void LoadUncompressedMips(TextureTarget textureTarget, byte[] ImageData, int MipLevel = 0)
public void LoadUncompressedMips(TextureTarget textureTarget, STGenericTexture.Surface ImageData,int mipwidth, int mipheight, int MipLevel = 0)
{
GL.TexImage2D<byte>(textureTarget, MipLevel, pixelInternalFormat, width, height, 0,
pixelFormat, PixelType.UnsignedByte, ImageData);
GL.TexImage2D<byte>(textureTarget, MipLevel, pixelInternalFormat, mipwidth, mipheight, 0,
pixelFormat, PixelType.UnsignedByte, ImageData.mipmaps[MipLevel]);
GL.GenerateMipmap((GenerateMipmapTarget)textureTarget);
// GL.GenerateMipmap((GenerateMipmapTarget)textureTarget);
}
private void LoadCompressedMips(TextureTarget textureTarget, byte[] ImageData, int MipLevel = 0)
public void LoadCompressedMips(TextureTarget textureTarget, STGenericTexture.Surface ImageData, int mipwidth, int mipheight, int MipLevel = 0)
{
GL.CompressedTexImage2D<byte>(textureTarget, MipLevel, (InternalFormat)pixelInternalFormat,
width, height, 0, getImageSize(this), ImageData);
mipwidth, mipheight, 0, getImageSize(this), ImageData.mipmaps[MipLevel]);
GL.GenerateMipmap((GenerateMipmapTarget)textureTarget);
// GL.GenerateMipmap((GenerateMipmapTarget)textureTarget);
}
public void Bind()

2
Switch_Toolbox_Library/Switch_Toolbox_Library.csproj
View file

@ -566,7 +566,7 @@
<Compile Include="Generics\GenericPolygonGroup.cs" />
<Compile Include="Generics\GenericTexture.cs" />
<Compile Include="Generics\OpenGLTexture.cs" />
<Compile Include="Generics\RenderableTex.cs" />
<Compile Include="Rendering\RenderableTex.cs" />
<Compile Include="Generics\STBone.cs" />
<Compile Include="Generics\STGenericWrapper.cs" />
<Compile Include="Generics\TEX_FORMAT.cs" />