diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 6021e4ca..62c1705f 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 02f6426d..328b5b00 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index f7d930a3..e614132d 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs b/Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs index af66336f..11d3e0dc 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/BfresWiiU.cs @@ -594,7 +594,23 @@ namespace FirstPlugin } else { - if (useSampler == "_a0") + if (texture.SamplerName == "s_diffuse") + { + m.HasDiffuseMap = true; + AlbedoCount++; + texture.Type = MatTexture.TextureType.Diffuse; + } + else if (texture.SamplerName == "s_normal") + { + m.HasNormalMap = true; + texture.Type = MatTexture.TextureType.Normal; + } + else if (texture.SamplerName == "s_specmask") + { + m.HasSpecularMap = true; + texture.Type = MatTexture.TextureType.Specular; + } + else if (useSampler == "_a0") { m.HasDiffuseMap = true; AlbedoCount++; diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 7d91fee4..a8460e95 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 10042c17..540f2cb2 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ diff --git a/Switch_Toolbox_Library/Rendering/RenderableTex.cs b/Switch_Toolbox_Library/Rendering/RenderableTex.cs index 95e38817..fe9698f1 100644 --- a/Switch_Toolbox_Library/Rendering/RenderableTex.cs +++ b/Switch_Toolbox_Library/Rendering/RenderableTex.cs @@ -117,9 +117,6 @@ namespace Switch_Toolbox.Library.Rendering mipmaps = new List() { GenericTexture.GetImageData(i, 0) } }); } - - if (!LoadArrayLevels) - break; } }