Merge branch 'hotfix/1.5.1'

Author: kleber-swf

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.1]
+
+### Fixed
+
+-  It wasn't possible to create custom character properties in the first execution
+
 ## [1.5.0]
 
 ### Added

Editor/Scripts/Model/BitmapFontCreatorModel.cs

@@ -10,20 +10,24 @@ internal class BitmapFontCreatorModel : ISerializationCallbackReceiver
 		private const string IgnoreCharacter = "\n";
 
 		[SerializeField] private string _characters = string.Empty;
-		public Orientation Orientation;
-		public int Cols;
-		public int Rows;
-		public float AlphaThreshold;
-		public bool Monospaced;
-		public bool CaseInsentive;
-		public float Ascent;
-		public float Descent;
-		public float FontSize;
-		public bool AutoFontSize;
-		public float LineSpacing;
-		public bool AutoLineSpacing;
-		public int DefaultCharacterSpacing;
-		public List<CharacterProps> CustomCharacterProps;
+		public Orientation Orientation = Orientation.Horizontal;
+		public int Cols = 1;
+		public int Rows = 1;
+		public float AlphaThreshold = 0f;
+		public bool Monospaced = false;
+		public bool CaseInsentive = false;
+		public int Ascent = 0;
+		public int Descent = 0;
+		public int FontSize = 0;
+		public bool AutoFontSize = true;
+		public int LineSpacing = 0;
+		public bool AutoLineSpacing = true;
+		public int DefaultCharacterSpacing = 0;
+		public List<CharacterProps> CustomCharacterProps = new();
+
+		public BitmapFontCreatorModel() { }
+
+		public BitmapFontCreatorModel(BitmapFontCreatorModel from) { from?.CopyTo(this); }
 
 		public string Characters
 		{
@@ -75,26 +79,5 @@ private void UpdateChacters()
 
 		public void OnBeforeSerialize() { }
 		public void OnAfterDeserialize() { UpdateChacters(); }
-
-		public static BitmapFontCreatorModel Default => new()
-		{
-			Characters = string.Empty,
-			Orientation = Orientation.Horizontal,
-			Cols = 1,
-			Rows = 1,
-			AlphaThreshold = 0f,
-			LineSpacing = 0f,
-			AutoLineSpacing = true,
-			FontSize = 0f,
-			AutoFontSize = true,
-			Monospaced = false,
-			CaseInsentive = false,
-			Ascent = 0f,
-			Descent = 0f,
-			DefaultCharacterSpacing = 0,
-			CustomCharacterProps = new List<CharacterProps>(),
-			ValidCharacters = string.Empty,
-			ValidCharactersCount = 0
-		};
 	}
 }

Editor/Scripts/Model/ExecutionData.cs

@@ -6,16 +6,15 @@ namespace dev.klebersilva.tools.bitmapfontcreator
 	[Serializable]
 	internal class ExecutionData : BitmapFontCreatorModel
 	{
-		public Texture2D Texture;
+		public Texture2D Texture = null;
 
-		public static new ExecutionData Default
+		public ExecutionData() : base() { }
+		public ExecutionData(BitmapFontCreatorModel from) : base(from) { }
+
+		public override void CopyTo(BitmapFontCreatorModel to)
 		{
-			get
-			{
-				var data = new ExecutionData { Texture = null };
-				BitmapFontCreatorModel.Default.CopyTo(data);
-				return data;
-			}
+			base.CopyTo(to);
+			if (to is ExecutionData t) t.Texture = Texture;
 		}
 	}
 }

Editor/Scripts/Model/RuntimeData.cs

@@ -11,7 +11,7 @@ internal class RuntimeData : ScriptableObject
 		public static RuntimeData Load()
 		{
 			var data = Resources.Load<RuntimeData>(DataPath);
-			data.Data ??= ExecutionData.Default;
+			data.Data ??= new ExecutionData();
 			return data;
 		}
 	}

Editor/Scripts/UI/Partials/BottomMenu.cs

@@ -31,13 +31,13 @@ private void DrawBottomMenu()
 
 		private void RollbackSettings()
 		{
-			var profile = (BitmapFontCreatorModel)_settings.Profiles.Selected ?? ExecutionData.Default;
+			var profile = (BitmapFontCreatorModel)_settings.Profiles.Selected ?? new ExecutionData();
 			profile.CopyTo(_data);
 		}
 
 		private void ClearSettings()
 		{
-			ExecutionData.Default.CopyTo(_data);
+			new ExecutionData().CopyTo(_data);
 		}
 	}
 }

Editor/Scripts/UI/Partials/FontGroup.cs

@@ -8,10 +8,10 @@ private void DrawFontInfoGroup()
 		{
 			EditorGUILayout.BeginVertical(Styles.Group);
 
-			_data.FontSize = UIUtils.FloatFieldWithAuto(UIContent.FontSize, _data.FontSize, UIContent.AutoFontSize, ref _data.AutoFontSize);
-			_data.LineSpacing = UIUtils.FloatFieldWithAuto(UIContent.LineSpacing, _data.LineSpacing, UIContent.AutoLineSpacing, ref _data.AutoLineSpacing);
-			_data.Ascent = UIUtils.FloatFieldMin(UIContent.Ascent, _data.Ascent, 0f);
-			_data.Descent = UIUtils.FloatFieldMin(UIContent.Descent, _data.Descent, 0f);
+			_data.FontSize = UIUtils.IntFieldWithAuto(UIContent.FontSize, _data.FontSize, UIContent.AutoFontSize, ref _data.AutoFontSize);
+			_data.LineSpacing = UIUtils.IntFieldWithAuto(UIContent.LineSpacing, _data.LineSpacing, UIContent.AutoLineSpacing, ref _data.AutoLineSpacing);
+			_data.Ascent = UIUtils.IntFieldMin(UIContent.Ascent, _data.Ascent, 0);
+			_data.Descent = UIUtils.IntFieldMin(UIContent.Descent, _data.Descent, 0);
 			_data.Monospaced = EditorGUILayout.Toggle(UIContent.Monospaced, _data.Monospaced);
 
 			EditorGUILayout.EndVertical();

Editor/Scripts/UI/Util/UIUtils.cs

@@ -5,14 +5,6 @@ namespace dev.klebersilva.tools.bitmapfontcreator
 {
 	internal static class UIUtils
 	{
-		public static float FloatFieldMin(GUIContent label, float value, float min)
-		{
-			EditorGUI.BeginChangeCheck();
-			value = EditorGUILayout.FloatField(label, value);
-			if (EditorGUI.EndChangeCheck() && value < min) value = min;
-			return value;
-		}
-
 		public static int IntFieldMin(GUIContent label, int value, int min)
 		{
 			EditorGUI.BeginChangeCheck();
@@ -21,11 +13,11 @@ public static int IntFieldMin(GUIContent label, int value, int min)
 			return value;
 		}
 
-		public static float FloatFieldWithAuto(GUIContent label, float value, GUIContent autoLabel, ref bool auto)
+		public static int IntFieldWithAuto(GUIContent label, int value, GUIContent autoLabel, ref bool auto)
 		{
 			GUILayout.BeginHorizontal();
 			GUI.enabled = !auto;
-			value = EditorGUILayout.FloatField(label, value);
+			value = EditorGUILayout.IntField(label, value);
 			GUI.enabled = true;
 
 			auto = EditorGUILayout.ToggleLeft(autoLabel, auto, GUILayout.Width(Styles.AutoToggleWidth));

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dev.klebersilva.tools.bitmapfontcreator",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"description": "Create bitmap fonts from sprite sheets in Unity.",
 	"displayName": "Bitmap Font Creator",
 	"unity": "2018.3",