diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index d3dd1469..1c75fa6b 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 e87b2c16..e2281847 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 c31b9cd1..c534c35b 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/BFRESAnimFolder.cs b/Switch_FileFormatsMain/FileFormats/BFRES/BFRESAnimFolder.cs index bf402d80..dcfdc7f9 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/BFRESAnimFolder.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/BFRESAnimFolder.cs @@ -291,13 +291,13 @@ namespace Bfres.Structs { group = GetOrCreateFolder(type); FSHU fshu = new FSHU(new ResU.ShaderParamAnim(), type); - group.AddNode(fshu, "NewShaderParamAnim"); + group.AddNode(fshu, "NewShaderParamAnim_fsp"); } else { group = GetOrCreateFolder(type); FMAA fmaa = new FMAA(new ResNX.MaterialAnim(), type); - group.AddNode(fmaa, "NewShaderParamAnim"); + group.AddNode(fmaa, "NewShaderParamAnim_fsp"); } AddFolder(group); @@ -312,13 +312,13 @@ namespace Bfres.Structs { group = GetOrCreateFolder(type); FSHU fshu = new FSHU(new ResU.ShaderParamAnim(), type); - group.AddNode(fshu, "NewColorAnim"); + group.AddNode(fshu, "NewColorAnim_fcl"); } else { group = GetOrCreateFolder(type); FMAA fmaa = new FMAA(new ResNX.MaterialAnim(), type); - group.AddNode(fmaa, "NewColorAnim"); + group.AddNode(fmaa, "NewColorAnim_fcl"); } AddFolder(group); @@ -333,13 +333,13 @@ namespace Bfres.Structs { group = GetOrCreateFolder(type); FSHU fshu = new FSHU(new ResU.ShaderParamAnim(), type); - group.AddNode(fshu, "NewTextureTransformAnim"); + group.AddNode(fshu, "NewTextureTransformAnim_fts"); } else { group = GetOrCreateFolder(type); FMAA fmaa = new FMAA(new ResNX.MaterialAnim(), type); - group.AddNode(fmaa, "NewTextureTransformAnim"); + group.AddNode(fmaa, "NewTextureTransformAnim_fts"); } AddFolder(group); @@ -354,13 +354,13 @@ namespace Bfres.Structs { group = GetOrCreateFolder(); FTXP anim = new FTXP(new ResU.TexPatternAnim()); - group.AddNode(anim, "NewTexturePatternAnim"); + group.AddNode(anim, "NewTexturePatternAnim_ftp"); } else { group = GetOrCreateFolder(type); FMAA fmaa = new FMAA(new ResNX.MaterialAnim(), type); - group.AddNode(fmaa, "NewTexturePatternAnim"); + group.AddNode(fmaa, "NewTexturePatternAnim_ftp"); } AddFolder(group); @@ -391,13 +391,13 @@ namespace Bfres.Structs { group = GetOrCreateFolder(VisibiltyAnimType.Material); FVIS anim = new FVIS(new ResU.VisibilityAnim() { Type = ResU.VisibilityAnimType.Material }); - group.AddNode(anim, "NewMatVisAnim"); + group.AddNode(anim, "NewMatVisAnim_fvm"); } else { group = GetOrCreateFolder(MaterialAnimation.AnimationType.Visibilty); FMAA fmaa = new FMAA(new ResNX.MaterialAnim(), MaterialAnimation.AnimationType.Visibilty); - group.AddNode(fmaa, "NewMatVisAnim"); + group.AddNode(fmaa, "NewMatVisAnim_fvm"); } AddFolder(group); diff --git a/Switch_FileFormatsMain/YAML/YamlFmaa.cs b/Switch_FileFormatsMain/YAML/YamlFmaa.cs index 55c7cfc6..640300c1 100644 --- a/Switch_FileFormatsMain/YAML/YamlFmaa.cs +++ b/Switch_FileFormatsMain/YAML/YamlFmaa.cs @@ -121,6 +121,10 @@ namespace FirstPlugin AnimConstant constant = new AnimConstant(); constant.AnimDataOffset = 0; constant.Value = matAnim.TextureNames.IndexOf(texturePatternCfg.ConstantValue.Texture); + matAnimData.Constants.Add(constant); + + matAnimData.VisualConstantIndex = 0; + matAnimData.BeginVisalConstantIndex = 0; } else if (texturePatternCfg.CurveData != null) { @@ -177,7 +181,6 @@ namespace FirstPlugin curve.KeyType = AnimCurveKeyType.Int16; else curve.KeyType = AnimCurveKeyType.Single; - } } diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 4f9eb906..2aa0a14d 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ