now you can expose ''single line'' the target

Cippo · Cippo · commit f20c1602d5df · 2019-04-06T11:41:16.000+02:00
diff --git a/InterfaceReference/Examples/Examples.unity b/InterfaceReference/Examples/Examples.unity
@@ -284,7 +284,7 @@ GameObject:
   - component: {fileID: 793930335}
   - component: {fileID: 793930334}
   m_Layer: 0
-  m_Name: Component with Type Filter
+  m_Name: Component with Type Filter Attribute
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -404,8 +404,8 @@ MonoBehaviour:
   - FavParams: 0
     FavString: []
     list:
-    - {fileID: 122467412}
-    ActiveGameObject: {fileID: 122467412}
+    - {fileID: 793930333}
+    ActiveGameObject: {fileID: 793930333}
     GUIDsList: []
     GUIDsActiveGameObject: 
     PATHsList: []
@@ -416,8 +416,8 @@ MonoBehaviour:
   - FavParams: 0
     FavString: []
     list:
-    - {fileID: 1824733537}
-    ActiveGameObject: {fileID: 1824733537}
+    - {fileID: 122467412}
+    ActiveGameObject: {fileID: 122467412}
     GUIDsList: []
     GUIDsActiveGameObject: 
     PATHsList: []
@@ -428,8 +428,8 @@ MonoBehaviour:
   - FavParams: 0
     FavString: []
     list:
-    - {fileID: 793930333}
-    ActiveGameObject: {fileID: 793930333}
+    - {fileID: 1824733537}
+    ActiveGameObject: {fileID: 1824733537}
     GUIDsList: []
     GUIDsActiveGameObject: 
     PATHsList: []
@@ -606,7 +606,7 @@ GameObject:
   - component: {fileID: 1968288555}
   - component: {fileID: 1968288554}
   m_Layer: 0
-  m_Name: Component with Exposed Reference
+  m_Name: Component with Expose Attribute
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -623,6 +623,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5d7b9862a7a50ed478a95fe23ae1a3c7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  customInterfaceReference:
+    name: Component that Implements Interface (ICustomInterfaceExample)
+    target: {fileID: 1308923936}
 --- !u!4 &1968288555
 Transform:
   m_ObjectHideFlags: 0
diff --git a/InterfaceReference/Scripts/Attributes/Expose.cs b/InterfaceReference/Scripts/Attributes/Expose.cs
@@ -6,13 +6,12 @@
 using CippSharp.Interfaces;
 using UnityEditor;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace CippSharp.Interfaces
 {
-     public class ExposeAttribute : Attribute
+     public class ExposeAttribute : PropertyAttribute
      {
-            ExposedReference<>
+		
      }
 }
 
@@ -26,13 +25,7 @@ namespace CippSharpEditor.Interfaces
     [CustomPropertyDrawer(typeof(ExposeAttribute))]
     public class ExposeAttributeDrawer : PropertyDrawer
     {
-        private object target = null;
-        private readonly Object nullObject = null;
-        private Object TargetObject
-        {
-            get { return target != null ? (Object)target : nullObject; }
-            set { target = value; }
-        }
+        private SerializedProperty ser_target = null;
         
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
         {
@@ -42,35 +35,32 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             ExposeAttribute exposeAttribute = attribute as ExposeAttribute;
-            Type fieldType = fieldInfo.FieldType;
-            if (property.propertyType == SerializedPropertyType.Generic && fieldType.IsInterface)
+			if (property.propertyType == SerializedPropertyType.Generic)
             {
-                if (exposeAttribute != null)
+                if (ser_target == null)
                 {
-                    target = fieldInfo.GetValue(property.serializedObject.targetObject);
-                    if (target == null)
-                    {    
-                        TargetObject = EditorGUI.ObjectField(position, TargetObject, typeof(Object), true);
-                        fieldInfo.SetValue(property.serializedObject.targetObject, TargetObject);
-                    }
-                    else if (target is Object)
+                    ser_target = property.FindPropertyRelative("target");
+                }
+
+                if (ser_target != null)
+                {
+                    if (exposeAttribute != null)
                     {
-                        TargetObject = EditorGUI.ObjectField(position, TargetObject, typeof(Object), true);
-                        fieldInfo.SetValue(property.serializedObject.targetObject, TargetObject);
+                        EditorGUIUtils.DrawProperty(position, ser_target, label);
                     }
                     else
                     {
-                        //Not implemented for interfaces that aren't also of type Object.
+                        Debug.LogError("Failed to assign the attribute.");
                     }
                 }
                 else
                 {
-                    Debug.LogError("Failed to assign the attribute.");
+                    Debug.LogWarning("Expose Attribute supports only Interface Reference fields. (Or fields with a sub-"+typeof(SerializedProperty).Name+" with name <i>target</i>");
                 }
             }
             else
             {
-                Debug.LogWarning("Expose Attribute supports only Interface Reference fields.");
+                Debug.LogWarning("Serialized Property is not of Generic type.");
             }
         }
     }
diff --git a/InterfaceReference/Scripts/Examples/ExposedInterfaceReference.cs b/InterfaceReference/Scripts/Examples/ExposedInterfaceReference.cs
@@ -1,9 +1,19 @@
-﻿using UnityEngine;
+﻿using System;
+using UnityEngine;
 
 namespace CippSharp.Interfaces.Examples
 {
     public class ExposedInterfaceReference : MonoBehaviour
     {
-        [SerializeField, Expose] public ICustomInterfaceExample customInterfaceExample = null;
+        [Serializable]
+        public class CustomInterfaceReference : InterfaceReference<ICustomInterfaceExample>
+        {
+			
+        }
+        
+        		
+        [Header("Interface:")]
+        [Expose] public CustomInterfaceReference customInterfaceReference = new CustomInterfaceReference();
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,12 @@`
`6`	`6`	`using CippSharp.Interfaces;`
`7`	`7`	`using UnityEditor;`
`8`	`8`	`using UnityEngine;`
`9`		`-using Object = UnityEngine.Object;`
`10`	`9`
`11`	`10`	`namespace CippSharp.Interfaces`
`12`	`11`	`{`
`13`		`- public class ExposeAttribute : Attribute`
	`12`	`+ public class ExposeAttribute : PropertyAttribute`
`14`	`13`	`{`
`15`		`- ExposedReference<>`
	`14`	`+`
`16`	`15`	`}`
`17`	`16`	`}`
`18`	`17`
`@@ -26,13 +25,7 @@ namespace CippSharpEditor.Interfaces`
`26`	`25`	`[CustomPropertyDrawer(typeof(ExposeAttribute))]`
`27`	`26`	`public class ExposeAttributeDrawer : PropertyDrawer`
`28`	`27`	`{`
`29`		`- private object target = null;`
`30`		`- private readonly Object nullObject = null;`
`31`		`- private Object TargetObject`
`32`		`- {`
`33`		`- get { return target != null ? (Object)target : nullObject; }`
`34`		`- set { target = value; }`
`35`		`- }`
	`28`	`+ private SerializedProperty ser_target = null;`
`36`	`29`
`37`	`30`	`public override float GetPropertyHeight(SerializedProperty property, GUIContent label)`
`38`	`31`	`{`
`@@ -42,35 +35,32 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent`
`42`	`35`	`public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)`
`43`	`36`	`{`
`44`	`37`	`ExposeAttribute exposeAttribute = attribute as ExposeAttribute;`
`45`		`- Type fieldType = fieldInfo.FieldType;`
`46`		`- if (property.propertyType == SerializedPropertyType.Generic && fieldType.IsInterface)`
	`38`	`+ if (property.propertyType == SerializedPropertyType.Generic)`
`47`	`39`	`{`
`48`		`- if (exposeAttribute != null)`
	`40`	`+ if (ser_target == null)`
`49`	`41`	`{`
`50`		`- target = fieldInfo.GetValue(property.serializedObject.targetObject);`
`51`		`- if (target == null)`
`52`		`- {`
`53`		`- TargetObject = EditorGUI.ObjectField(position, TargetObject, typeof(Object), true);`
`54`		`- fieldInfo.SetValue(property.serializedObject.targetObject, TargetObject);`
`55`		`- }`
`56`		`- else if (target is Object)`
	`42`	`+ ser_target = property.FindPropertyRelative("target");`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ if (ser_target != null)`
	`46`	`+ {`
	`47`	`+ if (exposeAttribute != null)`
`57`	`48`	`{`
`58`		`- TargetObject = EditorGUI.ObjectField(position, TargetObject, typeof(Object), true);`
`59`		`- fieldInfo.SetValue(property.serializedObject.targetObject, TargetObject);`
	`49`	`+ EditorGUIUtils.DrawProperty(position, ser_target, label);`
`60`	`50`	`}`
`61`	`51`	`else`
`62`	`52`	`{`
`63`		`- //Not implemented for interfaces that aren't also of type Object.`
	`53`	`+ Debug.LogError("Failed to assign the attribute.");`
`64`	`54`	`}`
`65`	`55`	`}`
`66`	`56`	`else`
`67`	`57`	`{`
`68`		`- Debug.LogError("Failed to assign the attribute.");`
	`58`	`+ Debug.LogWarning("Expose Attribute supports only Interface Reference fields. (Or fields with a sub-"+typeof(SerializedProperty).Name+" with name <i>target</i>");`
`69`	`59`	`}`
`70`	`60`	`}`
`71`	`61`	`else`
`72`	`62`	`{`
`73`		`- Debug.LogWarning("Expose Attribute supports only Interface Reference fields.");`
	`63`	`+ Debug.LogWarning("Serialized Property is not of Generic type.");`
`74`	`64`	`}`
`75`	`65`	`}`
`76`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,19 @@`
`1`		`-using UnityEngine;`
	`1`	`+using System;`
	`2`	`+using UnityEngine;`
`2`	`3`
`3`	`4`	`namespace CippSharp.Interfaces.Examples`
`4`	`5`	`{`
`5`	`6`	`public class ExposedInterfaceReference : MonoBehaviour`
`6`	`7`	`{`
`7`		`- [SerializeField, Expose] public ICustomInterfaceExample customInterfaceExample = null;`
	`8`	`+ [Serializable]`
	`9`	`+ public class CustomInterfaceReference : InterfaceReference<ICustomInterfaceExample>`
	`10`	`+ {`
	`11`	`+`
	`12`	`+ }`
	`13`	`+`
	`14`	`+`
	`15`	`+ [Header("Interface:")]`
	`16`	`+ [Expose] public CustomInterfaceReference customInterfaceReference = new CustomInterfaceReference();`
	`17`	`+`
`8`	`18`	`}`
`9`	`19`	`}`