Merge pull request #25 from rfadeev/unity-2019-support

Unity 2019 Support

Author: Dharengo

Diff for: Assets/Spriter2UnityDX/Editor/AnimationBuilder.cs

@@ -46,7 +46,7 @@ public AnimationBuilder (ScmlProcessingInfo info, IDictionary<int, IDictionary<i
 		}
 
 		public Object[] GetOrigClips () {
-			switch (S2USettings.ImportStyle) {
+			switch (S2USettings.GetOrCreateSettings().ImportOption) {
 			case AnimationImportOption.NestedInPrefab :
 				return AssetDatabase.LoadAllAssetRepresentationsAtPath(PrefabPath);
 			case AnimationImportOption.SeparateFolder :
@@ -112,7 +112,7 @@ public void Build (Animation animation, IDictionary<int, TimeLine> timeLines) {
 				AnimationUtility.SetAnimationEvents (clip, cachedEvents);
 				ProcessingInfo.ModifiedAnims.Add (clip);
 			} else {
-				switch (S2USettings.ImportStyle) {
+				switch (S2USettings.GetOrCreateSettings().ImportOption) {
 				case AnimationImportOption.NestedInPrefab : 
 					AssetDatabase.AddObjectToAsset (clip, PrefabPath); //Otherwise create a new one
 					break;

Diff for: Assets/Spriter2UnityDX/Editor/CustomEditors.cs

@@ -23,18 +23,21 @@ private string[] GetSortingLayerNames() {
 
 		public override void OnInspectorGUI ()
 		{
-			var changed = false;
+			EditorGUI.BeginChangeCheck();
 			var color = EditorGUILayout.ColorField ("Color", renderer.Color);
-			if (color != renderer.Color) {renderer.Color = color; changed = true;}
+			if (color != renderer.Color) {renderer.Color = color;}
 			var material = (Material)EditorGUILayout.ObjectField ("Material", renderer.Material, typeof(Material), false);
-			if (material != renderer.Material) {renderer.Material = material; changed = true;}
+			if (material != renderer.Material) {renderer.Material = material;}
 			var sortIndex = EditorGUILayout.Popup ("Sorting Layer", GetIndex (renderer.SortingLayerName), layerNames, GUILayout.ExpandWidth (true));
-			if (layerNames [sortIndex] != renderer.SortingLayerName) {renderer.SortingLayerName = layerNames[sortIndex]; changed = true;}
+			if (layerNames [sortIndex] != renderer.SortingLayerName) {renderer.SortingLayerName = layerNames[sortIndex];}
 			var sortingOrder = EditorGUILayout.IntField ("Order In Layer", renderer.SortingOrder);
-			if (sortingOrder != renderer.SortingOrder) {renderer.SortingOrder = sortingOrder; changed = true;}
+			if (sortingOrder != renderer.SortingOrder) {renderer.SortingOrder = sortingOrder;}
 			var applyZ = EditorGUILayout.Toggle ("Apply Spriter Z Order", renderer.ApplySpriterZOrder);
-			if (applyZ != renderer.ApplySpriterZOrder) {renderer.ApplySpriterZOrder = applyZ; changed = true;}
-			if (changed) EditorUtility.SetDirty(renderer);
+			if (applyZ != renderer.ApplySpriterZOrder) {renderer.ApplySpriterZOrder = applyZ;}
+			if (EditorGUI.EndChangeCheck())
+			{
+				EditorUtility.SetDirty(renderer);
+			}
 		}
 
 		private int GetIndex (string layerName) {

Diff for: Assets/Spriter2UnityDX/Editor/PrefabBuilder.cs

@@ -39,7 +39,7 @@ public bool Build (ScmlObject obj, string scmlPath) {
 				GameObject instance;
 				if (prefab == null) { //Creates an empty prefab if one doesn't already exists
 					instance = new GameObject (entity.name);
-					prefab = PrefabUtility.CreatePrefab (prefabPath, instance, ReplacePrefabOptions.ConnectToPrefab);
+					prefab = PrefabUtility.SaveAsPrefabAssetAndConnect (instance, prefabPath, InteractionMode.AutomatedAction);
 					ProcessingInfo.NewPrefabs.Add (prefab);
 				}
 				else {
@@ -156,7 +156,7 @@ private void TryBuild (Entity entity, GameObject prefab, GameObject instance, st
 				}
 			}
 			if (instance.GetComponent<EntityRenderer> () == null) instance.AddComponent<EntityRenderer> (); //Adds an EntityRenderer if one is not already present
-			PrefabUtility.ReplacePrefab (instance, prefab, ReplacePrefabOptions.ConnectToPrefab);
+			PrefabUtility.SaveAsPrefabAssetAndConnect (instance, prefabPath, InteractionMode.AutomatedAction);
 			DestroyImmediate (instance); //Apply the instance's changes to the prefab, then destroy the instance.
 		}
 
@@ -169,7 +169,7 @@ private Sprite GetSpriteAtPath (string path, File file, ref bool success) {
 					if (success) success = false; //If the texture type isn't Sprite, or the pivot isn't set properly, 
 					var settings = new TextureImporterSettings (); //set the texture type and pivot
 					importer.ReadTextureSettings (settings);	//and make success false so the process can abort
-					settings.ApplyTextureType (TextureImporterType.Sprite, true); //after all the textures have been processed
+					settings.ApplyTextureType (TextureImporterType.Sprite); //after all the textures have been processed
 					settings.spriteAlignment = (int)SpriteAlignment.Custom;
 					settings.spritePivot = new Vector2 (file.pivot_x, file.pivot_y);
                     if(ScmlImportOptions.options != null)

Diff for: Assets/Spriter2UnityDX/Editor/S2USettings.cs

@@ -4,40 +4,54 @@
 
 //Customizable settings for the importer
 namespace Spriter2UnityDX {
-	public class S2USettings : ScriptableObject {
-		private const string IMPORT = "import";
-
-		public static AnimationImportOption ImportStyle {
-			get { return (AnimationImportOption)EditorPrefs.GetInt (IMPORT); }
-			set { EditorPrefs.SetInt (IMPORT, (int)value); }
-		}
-
-		[MenuItem ("Edit/Project Settings/Spriter2UnityDX")]
-		public static void Select () {
-			var settings = CreateInstance<S2USettings> ();
-			Selection.activeObject = settings;
+	internal static class S2USettingsIMGUIRegister
+	{
+		[SettingsProvider]
+		public static SettingsProvider CreateS2USettingsProvider()
+		{
+			var provider = new SettingsProvider("Project/Spriter2UnityDX", SettingsScope.Project)
+			{
+				guiHandler = (searchContext) =>
+				{
+					var settings = S2USettings.GetSerializedSettings();
+					var label = new GUIContent("Animation Import Style",
+						"By default, animations are nested into the generated prefab. Change this option to instead place animations into a separate folder.");
+					EditorGUILayout.PropertyField(settings.FindProperty("importOption"), label);
+					settings.ApplyModifiedProperties();
+				},
+			};
+
+			return provider;
 		}
 	}
 
-	public enum AnimationImportOption : byte { NestedInPrefab, SeparateFolder }
-
-	[CustomEditor (typeof(S2USettings))] public class SettingsEditor: Editor {
-		private AnimationImportOption importStyle;
-
-		private void OnEnable () {
-			importStyle = S2USettings.ImportStyle;
-		}
-
-		private void OnDisable () {
-			DestroyImmediate (target);
+	public class S2USettings : ScriptableObject
+	{
+		private const string settingsPath = "Assets/Spriter2UnityDX/Editor/Settings.asset";
+
+		[SerializeField]
+		private AnimationImportOption importOption;
+
+		internal AnimationImportOption ImportOption { get { return importOption; } }
+
+		internal static S2USettings GetOrCreateSettings()
+		{
+			var settings = AssetDatabase.LoadAssetAtPath<S2USettings>(settingsPath);
+			if (settings == null)
+			{
+				settings = ScriptableObject.CreateInstance<S2USettings>();
+				settings.importOption = AnimationImportOption.NestedInPrefab;
+				AssetDatabase.CreateAsset(settings, settingsPath);
+				AssetDatabase.SaveAssets();
+			}
+			return settings;
 		}
 
-		public override void OnInspectorGUI () {
-			EditorGUI.BeginChangeCheck ();
-			var label = new GUIContent ("Animation Import Style", 
-				"By default, animations are nested into the generated prefab. Change this option to instead place animations into a separate folder.");
-			importStyle = (AnimationImportOption)EditorGUILayout.EnumPopup (label, importStyle);
-			if (EditorGUI.EndChangeCheck ()) S2USettings.ImportStyle = importStyle;
+		internal static SerializedObject GetSerializedSettings()
+		{
+			return new SerializedObject(GetOrCreateSettings());
 		}
 	}
+
+	public enum AnimationImportOption : byte { NestedInPrefab, SeparateFolder }
 }

Diff for: Assets/Spriter2UnityDX/Editor/Settings.asset

@@ -3,12 +3,13 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9f361e2f9624e406e9f836e8793ee5b8, type: 3}
   m_Name: Settings
   m_EditorClassIdentifier: 
-  AnimationImportStyle: 1
+  importOption: 0