Merge branch 'feature/profiles' into develop

Author: kleber-swf

.gitignore

@@ -69,4 +69,7 @@ crashlytics-build.properties
 
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
-/[Aa]ssets/[Ss]treamingAssets/aa/*
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+
+# Project specifics
+/[Aa]ssets/BitmapFontCreator/Resources/*

Assets/BitmapFontCreator/Editor/BitmapFontCreator.cs

@@ -7,7 +7,7 @@ namespace kleberswf.tools.bitmapfontcreator
 {
 	internal static class BitmapFontCreator
 	{
-		public static void CreateFont(BitmapFontCreatorData data)
+		public static void CreateFont(ExecutionData data)
 		{
 			var error = CheckForErrors(data);
 			if (!string.IsNullOrEmpty(error))
@@ -32,7 +32,7 @@ public static void CreateFont(BitmapFontCreatorData data)
 		}
 
 		// TODO all checks
-		private static string CheckForErrors(BitmapFontCreatorData data)
+		private static string CheckForErrors(ExecutionData data)
 		{
 			if (data.Texture == null) return "Texture cannot be null";
 			if (!data.Texture.isReadable) return "Texture must be readable. Set Read/Write Enabled to true inside Texture Properties";
@@ -52,7 +52,7 @@ private static Material CreateMaterial(string baseName, Texture2D texture)
 			};
 		}
 
-		private static Font CreateFontAsset(string baseName, Material material, BitmapFontCreatorData data)
+		private static Font CreateFontAsset(string baseName, Material material, ExecutionData data)
 		{
 			var map = new Dictionary<char, CharacterProps>();
 			foreach (var e in data.CustomCharacterProps)
@@ -65,7 +65,7 @@ private static Font CreateFontAsset(string baseName, Material material, BitmapFo
 			};
 		}
 
-		private static CharacterInfo[] CreateCharacters(BitmapFontCreatorData data, Dictionary<char, CharacterProps> map)
+		private static CharacterInfo[] CreateCharacters(ExecutionData data, Dictionary<char, CharacterProps> map)
 		{
 			var texSize = new Vector2(data.Texture.width, data.Texture.height);
 			var cellSize = new Vector2(texSize.x / data.Cols, texSize.y / data.Rows);

Assets/BitmapFontCreator/Editor/Model/BitmapFontCreatorModel.cs

@@ -17,9 +17,8 @@ internal class CharacterProps
 		public int Spacing = 0;
 	}
 
-	internal struct BitmapFontCreatorData
+	internal class BitmapFontCreatorData
 	{
-		public Texture2D Texture;
 		public string Characters;
 		public Orientation Orientation;
 		public int Cols;
@@ -30,7 +29,32 @@ internal struct BitmapFontCreatorData
 		public int DefaultCharacterSpacing;
 		public List<CharacterProps> CustomCharacterProps;
 
-		public static BitmapFontCreatorData Default => new()
+		public virtual void CopyTo(BitmapFontCreatorData dest)
+		{
+			if (dest == null) return;
+
+			dest.Characters = Characters;
+			dest.Orientation = Orientation;
+			dest.Cols = Cols;
+			dest.Rows = Rows;
+			dest.AlphaThreshold = AlphaThreshold;
+			dest.Monospaced = Monospaced;
+			dest.DefaultCharacterSpacing = DefaultCharacterSpacing;
+
+			if (dest.CustomCharacterProps != null) dest.CustomCharacterProps.Clear();
+			else dest.CustomCharacterProps = new List<CharacterProps>();
+
+			foreach (var e in CustomCharacterProps)
+				dest.CustomCharacterProps.Add(new CharacterProps() { Character = e.Character, Spacing = e.Spacing });
+		}
+	}
+
+	internal class ExecutionData : BitmapFontCreatorData
+	{
+		public Texture2D Texture;
+
+		// TODO move this to ui
+		public static ExecutionData Default => new()
 		{
 			Texture = null,
 			Characters = "$ 0123456789 . ",

Assets/BitmapFontCreator/Editor/Model/BitmapFontCreatorUIModel.cs

@@ -30,10 +30,11 @@ internal static class UI
 		public static readonly GUIContent AlphaThreshold = new("Alpha Threshold", "Alpha threshold to identify characters bounds");
 		public static readonly GUIContent Monospaced = new("Monospaced", "Whether the result font should be monospaced");
 		public static readonly GUIContent CharacterSet = new("Character Set", "Predefined character set to use");
-		public static readonly GUIContent Characters = new("Characters", "Characters used in the font in order they appear in the texture");
+		public static readonly GUIContent Characters = new("Characters", "Characters used in the font in order they appear in the texture. Use the space character to represent blank spaces in the texture");
 		public static readonly GUIContent DefaultCharacterSpacing = new("Character Spacing", "Default spacing between characters");
 		public static readonly GUIContent CustomCharacterProperties = new("Custom Character Properties", "Custom properties for each characters, if any");
 		public static readonly GUIContent CreateFont = new("Create", "Create the font");
+		public static readonly GUIContent Profile = new("Profile", "Manage profiles");
 	}
 
 	internal static class Styles
@@ -43,12 +44,16 @@ internal static class Styles
 			margin = new(EditorStyles.label.margin.left, EditorStyles.label.margin.right, 5, 5),
 		};
 
-		public static readonly GUIStyle CreateButton = new(EditorStyles.miniButton)
+		public static readonly GUIStyle CreateButton = new(GUI.skin.button)
 		{
-			fontSize = 12,
-			padding = new(20, 20, 8, 8),
+			padding = new(20, 20, 7, 8),
 			margin = new(10, 10, 20, 20),
 			fixedHeight = 32,
 		};
+
+		public static readonly GUIStyle BottomMenu = new("flow background")
+		{
+			padding = new(3, 3, 5, 0),
+		};
 	}
 }

Assets/BitmapFontCreator/Editor/Model/Prefs.meta

@@ -0,0 +1,32 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace kleberswf.tools.bitmapfontcreator
+{
+	internal class BitmapFontCreatorPrefs : ScriptableObject, ISerializationCallbackReceiver
+	{
+		private const string PrefsFilename = "BitmapFontCreatorPrefs";
+		private const string PrefsFilepath = "Assets/BitmapFontCreator/Resources/" + PrefsFilename + ".asset";
+
+		public ProfileList Profiles;
+
+		public static BitmapFontCreatorPrefs Load()
+		{
+			var prefs = Resources.Load(PrefsFilename, typeof(BitmapFontCreatorPrefs)) as BitmapFontCreatorPrefs;
+			if (prefs == null)
+			{
+				prefs = CreateInstance<BitmapFontCreatorPrefs>();
+				AssetDatabase.CreateAsset(prefs, PrefsFilepath);
+				EditorUtility.SetDirty(prefs);
+			}
+			return prefs;
+		}
+
+		public void OnAfterDeserialize()
+		{
+			Profiles.UpdateCache();
+		}
+
+		public void OnBeforeSerialize() { }
+	}
+}

Assets/BitmapFontCreator/Editor/Model/Prefs/BitmapFontCreatorPrefs.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace kleberswf.tools.bitmapfontcreator
+{
+	[Serializable]
+	internal class Profile : BitmapFontCreatorData
+	{
+		public string Name;
+		public Profile() { }
+
+		public Profile(string name, BitmapFontCreatorData src)
+		{
+			Name = name;
+			src?.CopyTo(this);
+		}
+	}
+}

Assets/BitmapFontCreator/Editor/Model/Prefs/BitmapFontCreatorPrefs.cs.meta

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace kleberswf.tools.bitmapfontcreator
+{
+	[Serializable]
+	internal class ProfileList
+	{
+		[SerializeField] private int _selectedIndex = -1;
+		[SerializeField] private List<Profile> _profiles = new();
+
+		private string[] _names = new string[0];
+
+		public int SelectedIndex
+		{
+			get => _selectedIndex;
+			set => _selectedIndex = value;
+		}
+
+		public Profile Selected
+		{
+			get
+			{
+				return _selectedIndex < 0 || _selectedIndex >= _profiles.Count
+					? null : _profiles[_selectedIndex];
+			}
+		}
+
+		public string[] Names => _names;
+
+		public void UpdateCache()
+		{
+			var lastSelected = _selectedIndex < 0 ? null : _profiles[_selectedIndex].Name;
+			_profiles.Sort((a, b) => a.Name.CompareTo(b.Name));
+			_names = _profiles.Select(e => e.Name).ToArray();
+			if (!string.IsNullOrEmpty(lastSelected)) _selectedIndex = Array.IndexOf(_names, lastSelected);
+		}
+
+		public void Add(Profile data)
+		{
+			_profiles.Add(data);
+			_selectedIndex = _profiles.Count - 1;
+			UpdateCache();
+		}
+
+		public bool RemoveAt(int index)
+		{
+			if (index < 0 || index >= _profiles.Count) return false;
+			_profiles.RemoveAt(index);
+			_selectedIndex = -1;
+			UpdateCache();
+			return true;
+		}
+
+		public void Update(int index, Profile data)
+		{
+			if (data == null) return;
+			if (index < 0 || index >= _profiles.Count)
+				Add(data);
+			else
+				data.CopyTo(_profiles[index]);
+		}
+	}
+}