licence, readme.md

Assets/Editor/UnityPickers/AssetPicker.cs

@@ -156,15 +156,16 @@ private Type AssetType
 
 		private HierarchyEntry firstVisibleEntry;
 
-		[MenuItem("Tools/Asset picker %&#A", false, 5000)]
-		public static void ShowAssetPicker()
+		[MenuItem("Tools/Asset Picker %&#O", false, 5000)]
+		public static void OpenWindow()
 		{
 			var w = GetWindow<AssetPicker>();
 			w.focusNameFilter = true;
 			w.UpdateAssetList();
 		}
 
-		public static void ShowAssetPicker(
+		// todo: prettifty Show signatures
+		public static void Show(
 			[NotNull] Type assetType, 
 			[CanBeNull] FieldInfo fieldInfo, 
 			[NotNull] Action<Object> callback, 
@@ -204,7 +205,11 @@ public static void ShowAssetPicker(
 			w.Focus();
 		}
 
-	    public static void ShowAssetPicker<T>(Action<Object> callback, string[] labels, bool enableSelectionOnClick = false, Object selectedAsset = null)
+	    public static void Show<T>(
+			[NotNull] Action<Object> callback, 
+			[CanBeNull] string[] labels = null, 
+			bool enableSelectionOnClick = false, 
+			[CanBeNull] Object selectedAsset = null)
 	    {
 	        var w = CreateInstance<AssetPicker>();
 	        w.enableSelectionOnClick = enableSelectionOnClick;
@@ -224,34 +229,20 @@ public static void ShowAssetPicker<T>(Action<Object> callback, string[] labels,
             w.Focus();
         }
 
-		public IEnumerable<Type> CollectAssetTypes()
-		{
-			yield return typeof(GameObject);
-			yield return typeof(Material);
-			yield return typeof(Texture);
-			yield return typeof(SceneAsset);
-			yield return typeof(ScriptableObject);
-
-			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-			var gameAssembly = assemblies.Single(a => a.FullName.Contains("Assembly-CSharp,"));
-			var soTypes = TypeEx.GetSubclasses<ScriptableObject>(true, gameAssembly);
-
-			foreach (var type in soTypes)
-			{
-				yield return type;
-			}
-		}
-
 		// todo: c# docs
 
 		/// <summary>
 		/// Shows built-in ObjectField with custom value source and pick target
 		/// </summary>
-		public static void ShowPropertyField(
-			Rect position, SerializedProperty property, FieldInfo fieldInfo, 
-			Object currentValue, Action<Object> pickCallback, 
-			GUIContent label, Type assetType,
-			Func<HierarchyEntry, bool> filter = null)
+		public static void PropertyField(
+			Rect position, 
+			[NotNull] SerializedProperty property, 
+			[NotNull] FieldInfo fieldInfo,
+			[CanBeNull] Object currentValue, 
+			[NotNull] Action<Object> pickCallback,
+			[NotNull] GUIContent label, 
+			[NotNull] Type assetType,
+			[CanBeNull] Func<HierarchyEntry, bool> filter = null)
 		{
 			using (var scope = new EditorGUI.PropertyScope(position, label, property))
 			{
@@ -284,7 +275,7 @@ public static void ShowPropertyField(
 				else if (showHotKey || GUI.Button(buttonPos, "", GUIStyle.none))
 				{
 					// invisible button overrides object picker
-					ShowAssetPicker(
+					Show(
 						assetType,
 						fieldInfo,
 						o =>
@@ -315,7 +306,7 @@ public static void ShowPropertyField(
 
 				if (GUI.GetNameOfFocusedControl() == controlName)
 				{
-					// todo: fix copy paste
+					// todo: implement copy paste
 					// CopyPasteController.Process(assetType, property);
 				}
 
@@ -329,28 +320,37 @@ public static void ShowPropertyField(
 		/// <summary>
 		/// Shows built-in ObjectField, but overrides thumb button to call our AssetPicker window instead
 		/// </summary>
-		public static void ShowPropertyField(Rect position, SerializedProperty property, FieldInfo fieldInfo, GUIContent label, Type assetType, Func<HierarchyEntry, bool> filter = null)
+		public static void PropertyField(
+			Rect position, 
+			[NotNull] SerializedProperty property, 
+			[NotNull] FieldInfo fieldInfo, 
+			[NotNull] GUIContent label, 
+			[NotNull] Type assetType, 
+			[CanBeNull] Func<HierarchyEntry, bool> filter = null)
 		{
-			Action<Object> pickCallback = 
+			Action<Object> pickCallback =
 				o => property.objectReferenceValue = o;
-			ShowPropertyField(
+			PropertyField(
 				position, property, fieldInfo,
 				property.objectReferenceValue, pickCallback,
 				label, assetType, filter
 			);
 		}
 
-		public static void ShowObjectField(
-			Rect position, Object currentValue, Action<Object> pickCallback,
-			GUIContent label, Type assetType,
-			Func<HierarchyEntry, bool> filter = null)
+		public static void ObjectField(
+			Rect position, 
+			[CanBeNull] Object currentValue, 
+			[NotNull] Action<Object> pickCallback,
+			[NotNull] GUIContent label, 
+			[NotNull] Type assetType,
+			[CanBeNull] Func<HierarchyEntry, bool> filter = null)
 		{
 			EditorGUI.BeginChangeCheck();
 			var buttonPos = position;
 			buttonPos.xMin = buttonPos.xMax - EditorGUIUtility.singleLineHeight;
 			var requesterWindow = focusedWindow;
 
-			string controlName = "ObjField"+label.text;
+			string controlName = "ObjField" + label.text;
 			var e = Event.current;
 			bool showHotKey =
 				GUI.GetNameOfFocusedControl() == controlName &&
@@ -374,7 +374,7 @@ public static void ShowObjectField(
 			else if (showHotKey || GUI.Button(buttonPos, "", GUIStyle.none))
 			{
 				// invisible button overrides object picker
-				ShowAssetPicker(
+				Show(
 					assetType,
 					null,
 					o =>
@@ -405,6 +405,24 @@ public static void ShowObjectField(
 			}
 		}
 
+		public IEnumerable<Type> CollectAssetTypes()
+		{
+			yield return typeof(GameObject);
+			yield return typeof(Material);
+			yield return typeof(Texture);
+			yield return typeof(SceneAsset);
+			yield return typeof(ScriptableObject);
+
+			var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+			var gameAssembly = assemblies.Single(a => a.FullName.Contains("Assembly-CSharp,"));
+			var soTypes = TypeEx.GetSubclasses<ScriptableObject>(true, gameAssembly);
+
+			foreach (var type in soTypes)
+			{
+				yield return type;
+			}
+		}
+
 		static AssetPicker()
 		{
 		}

Assets/Editor/UnityPickers/AssetPickerDrawer.cs

@@ -15,9 +15,12 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 			if (assetType.IsUnityCollection())
 				assetType = assetType.GetElementType();
 
+			if (assetType == null)
+				return;
+
 			var a = fieldInfo.GetAttribute<AssetPickerAttribute>();
 
-			AssetPicker.ShowPropertyField(
+			AssetPicker.PropertyField(
 				position, property, fieldInfo,
 				label, assetType,
 				he => a == null || he.Path.Contains(a.Path)

Assets/Editor/UnityPickers/ValuePicker.cs

@@ -17,8 +17,6 @@ public abstract class ValuePicker<T> : EditorWindow
 
 		private static GUIStyle selectedStyle;
 
-		// todo: previous selected style
-
 		[CanBeNull]
 	    private T prevPicked;
 

Assets/Example/Code/Monster.cs

@@ -12,5 +12,8 @@ public class Monster : ScriptableObject
 
 		[AssetPicker("Example/Monsters/Prefabs")]
 		public MonsterView Prefab;
+
+		[AssetPicker]
+		public Texture Icon;
 	}
 }

Assets/Example/Code/StartHereAsset.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+using UnityPickers;
+
+namespace Example.Code
+{
+	[CreateAssetMenu(menuName = "Resources/StartHere")]
+	public class StartHereAsset : ScriptableObject
+	{
+		public MonsterType MonsterType;
+
+		public Monster Monster;
+
+		public Faction Faction;
+
+		[AssetPicker]
+		public GameObject AnyPrefab;
+
+		[AssetPicker("Example/Monsters/Prefabs")]
+		public MonsterView MonsterPrefab;
+
+		[AssetPicker]
+		public Texture Icon;
+	}
+}

Assets/Example/Root.asset → Assets/Example/START_HERE.asset

@@ -9,10 +9,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b39f6e84c4284def828908dace078c2c, type: 3}
-  m_Name: Root
+  m_Name: START_HERE
   m_EditorClassIdentifier: 
-  Monsters:
-  - {fileID: 11400000, guid: 8f68f7791183abd458bf9ebee40de012, type: 2}
-  - {fileID: 11400000, guid: 6236317bb59716342ba83c17cf36f989, type: 2}
-  - {fileID: 11400000, guid: 46f2f905e3d786a4f8ba428d82d846db, type: 2}
-  - {fileID: 11400000, guid: 4c150a27badb11c4ea87c7e99e154d3e, type: 2}
+  Monster: {fileID: 0}
+  Faction: {fileID: 0}
+  MonsterType: 0
+  AnyPrefab: {fileID: 0}
+  MonsterPrefab: {fileID: 0}
+  Icon: {fileID: 0}