From 203f251df65301076f0eb6b2cafad98695f67e82 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Tue, 15 Jan 2019 19:34:02 -0600 Subject: [PATCH] Removed font section. --- RecrownedAthenaeum/Serializable/SkinData.cs | 40 +++++++++------------ RecrownedAthenaeum/UI/Skin/Skin.cs | 6 +--- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/RecrownedAthenaeum/Serializable/SkinData.cs b/RecrownedAthenaeum/Serializable/SkinData.cs index 9dd81b0..e914126 100644 --- a/RecrownedAthenaeum/Serializable/SkinData.cs +++ b/RecrownedAthenaeum/Serializable/SkinData.cs @@ -8,17 +8,24 @@ namespace RecrownedAthenaeum.Serializable public class SkinData { /// - /// The name of the atlas with solution of ".tatlas". + /// Author name. + /// + public string author; + + /// + /// Description of skin. + /// + public string description; + + /// + /// The name of the atlas with extension. /// public string nameOfTextureAtlas; /// /// The color data containing the name of the color, and red, green, and blue values for the color. /// public ColorData[] colors; - /// - /// The font data containing the name of the font and name of the file for the font. - /// - public FontData[] fonts; + /// /// The skin definitions containing a name for the definition, and the definition itself. /// @@ -27,7 +34,7 @@ namespace RecrownedAthenaeum.Serializable /// /// Color data for data transfer. /// - public class ColorData + public struct ColorData { /// /// Name of color to be referenced by. @@ -35,30 +42,15 @@ namespace RecrownedAthenaeum.Serializable public string name; /// - /// RGB data of this color. + /// RGBA data of this color. /// - public int r, g, b; - } - - /// - /// Font data for data transfer. - /// - public class FontData - { - /// - /// Name of font to be referenced by. - /// - public string name; - /// - /// Name of the file that contains the font. Shouldn't have extension. - /// - public string font; + public int r, g, b, a; } /// /// Definition data for data transfer. /// - public class DefinitionData + public struct DefinitionData { /// /// Name of definition to be referenced by. diff --git a/RecrownedAthenaeum/UI/Skin/Skin.cs b/RecrownedAthenaeum/UI/Skin/Skin.cs index c4a46e5..78eed68 100644 --- a/RecrownedAthenaeum/UI/Skin/Skin.cs +++ b/RecrownedAthenaeum/UI/Skin/Skin.cs @@ -20,10 +20,7 @@ namespace RecrownedAthenaeum.UI.Skin /// Colors stored in this skin. /// public readonly Dictionary colors; - /// - /// Fonts stored in this skin. - /// - public readonly Dictionary fonts; + Dictionary> definitions; /// @@ -34,7 +31,6 @@ namespace RecrownedAthenaeum.UI.Skin { this.textureAtlas = textureAtlas; colors = new Dictionary(); - fonts = new Dictionary(); definitions = new Dictionary>(); }