diff --git a/File_Format_Library/FileFormats/Layout/CAFE/MAT1.cs b/File_Format_Library/FileFormats/Layout/CAFE/MAT1.cs index adee8f75..036c4d47 100644 --- a/File_Format_Library/FileFormats/Layout/CAFE/MAT1.cs +++ b/File_Format_Library/FileFormats/Layout/CAFE/MAT1.cs @@ -98,6 +98,11 @@ namespace LayoutBXLYT.Cafe [TypeConverter(typeof(ExpandableObjectConverter))] public FontShadowParameter FontShadowParameter { get; set; } + public string ToJson() + { + return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); + } + private uint flags; private int unknown; @@ -242,6 +247,8 @@ namespace LayoutBXLYT.Cafe public void Write(FileWriter writer, LayoutHeader header) { + Console.WriteLine(ToJson()); + long flagPos = 0; writer.WriteString(Name, 0x1C); if (header.VersionMajor >= 8) @@ -284,7 +291,7 @@ namespace LayoutBXLYT.Cafe for (int i = 0; i < TexCoordGens.Length; i++) { flags += Bit.BitInsert(1, 1, 2, 26); - ((TexCoordGen)TexCoordGens[i]).Write(writer); + ((TexCoordGen)TexCoordGens[i]).Write(writer, (BxlytHeader)header); } for (int i = 0; i < TevStages.Length; i++) diff --git a/File_Format_Library/FileFormats/Layout/Common.cs b/File_Format_Library/FileFormats/Layout/Common.cs index 0045066e..545e82ab 100644 --- a/File_Format_Library/FileFormats/Layout/Common.cs +++ b/File_Format_Library/FileFormats/Layout/Common.cs @@ -12,43 +12,43 @@ using System.ComponentModel; using System.IO; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -using SharpYaml.Serialization; +using Newtonsoft.Json; namespace LayoutBXLYT { public class BasePane : SectionCommon, ICloneable { [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal BxlytHeader LayoutFile; [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal PaneAnimController animController = new PaneAnimController(); [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal TreeNodeCustom NodeWrapper; [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal bool IsRoot { get { return Parent == null; } } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal bool ParentIsRoot { get { return Parent != null && Parent.IsRoot; } } - [YamlIgnore] + [JsonIgnore] internal RenderablePane renderablePane; [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal virtual bool DisplayInEditor { get; set; } = true; private string name; @@ -154,14 +154,14 @@ namespace LayoutBXLYT public virtual bool InfluenceAlpha { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public BasePane Parent { get; set; } [Browsable(false)] public List Childern { get; set; } = new List(); [Browsable(false)] - [YamlIgnore] + [JsonIgnore] internal bool HasChildern { get { return Childern.Count > 0; } @@ -348,7 +348,7 @@ namespace LayoutBXLYT private CustomRectangle rectangle; [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public virtual CustomRectangle Rectangle { get @@ -1448,7 +1448,7 @@ namespace LayoutBXLYT public List TexCoords = new List(); - [YamlIgnore] + [JsonIgnore] private BxlytHeader LayoutFile; public object Clone() @@ -2429,27 +2429,27 @@ namespace LayoutBXLYT //incase the settings get renabled, which keeps the previous data [Browsable(false)] - [YamlIgnore] + [Newtonsoft.Json.JsonIgnore] public bool EnableAlphaCompare { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public bool EnableBlend { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public bool EnableBlendLogic { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public bool EnableIndParams { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public bool EnableFontShadowParams { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public TreeNodeCustom NodeWrapper; public bool TryRemoveTexture(string name) @@ -2508,14 +2508,14 @@ namespace LayoutBXLYT public BxlytTextureTransform[] TextureTransforms { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public MaterialAnimController animController = new MaterialAnimController(); [DisplayName("Name"), CategoryAttribute("General")] public virtual string Name { get; set; } [Browsable(false)] - [YamlIgnore] + [JsonIgnore] public BxlytHeader ParentLayout; public void SetName(string oldName, string newName)