diff --git a/Assets/Example.meta b/Assets/Example.meta new file mode 100644 index 0000000..0a872f9 --- /dev/null +++ b/Assets/Example.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fa875a00fbff0347b96e37e1dc81575 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Example/Example.cs b/Assets/Example/Example.cs new file mode 100644 index 0000000..08a4082 --- /dev/null +++ b/Assets/Example/Example.cs @@ -0,0 +1,120 @@ +#if UNITY_2019_3_OR_NEWER +using System.Collections.Generic; +using System; +using UnityEditor; +using UnityEngine; + +[Serializable] +public abstract class Food +{ + public string name; + + public float kcal; +} + +[Serializable] +public class Apple : Food +{ + public Apple () + { + name = "Apple"; + kcal = 100f; + } +} + +[Serializable] +public class Peach : Food +{ + public Peach () + { + name = "Peach"; + kcal = 100f; + } +} + +[Serializable] +public class Grape : Food +{ + public Grape () + { + name = "Grape"; + kcal = 100f; + } +} + +public class Example : MonoBehaviour +{ + + [SerializeReference] + public Food food1 = new Apple(); + + [SerializeReference] + public Food food2 = new Peach(); + + [SerializeReference] + public Food food3 = new Grape(); + + [SerializeReference, SubclassSelector] + public Food foodOne = new Apple(); + + [SerializeReference, SubclassSelector] + public Food foodTwo = new Peach(); + + [SerializeReference, SubclassSelector] + public Food foodThree = new Grape(); + + [SerializeReference] + public List foodsOne = new List + { + new Apple(), + new Peach(), + new Grape() + }; + + [SerializeReference, SubclassSelector] + public List foodsTwo = new List + { + new Apple(), + new Peach(), + new Grape() + }; +} + +#if UNITY_EDITOR + +/// These classes are in a folder named "Editor" in the project + +[CustomPropertyDrawer(typeof(Peach), true)] +public class PeachDrawer : PropertyDrawer +{ + public override void OnGUI (Rect position, SerializedProperty property, GUIContent label) + { + position.height = EditorGUIUtility.singleLineHeight; + EditorGUI.PropertyField(position, property.FindPropertyRelative("name")); + + position.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + EditorGUI.PropertyField(position, property.FindPropertyRelative("kcal")); + } + + public override float GetPropertyHeight (SerializedProperty property, GUIContent label) + { + return EditorGUIUtility.singleLineHeight * 2 + EditorGUIUtility.standardVerticalSpacing * 1; + } +} + +[CustomPropertyDrawer(typeof(Apple), true)] +public class AppleDrawer : PropertyDrawer +{ + public override void OnGUI (Rect position, SerializedProperty property, GUIContent label) + { + EditorGUI.LabelField(position, "I'm an apple!"); + } + + public override float GetPropertyHeight (SerializedProperty property, GUIContent label) + { + return EditorGUIUtility.singleLineHeight; + } +} +#endif + +#endif \ No newline at end of file diff --git a/Assets/Example/Example.cs.meta b/Assets/Example/Example.cs.meta new file mode 100644 index 0000000..78e1f5f --- /dev/null +++ b/Assets/Example/Example.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2be69d932204e464fb7da2e0d53eab25 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Example/Example.unity b/Assets/Example/Example.unity new file mode 100644 index 0000000..50af01c --- /dev/null +++ b/Assets/Example/Example.unity @@ -0,0 +1,430 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &126803971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 126803974} + - component: {fileID: 126803973} + - component: {fileID: 126803972} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &126803972 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126803971} + m_Enabled: 1 +--- !u!20 &126803973 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126803971} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &126803974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 126803971} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &586792171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 586792173} + - component: {fileID: 586792172} + m_Layer: 0 + m_Name: Example + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &586792172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586792171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2be69d932204e464fb7da2e0d53eab25, type: 3} + m_Name: + m_EditorClassIdentifier: + food1: + rid: 9020349853700980763 + food2: + rid: 9020349853700980764 + food3: + rid: 9020349853700980765 + foodOne: + rid: 9020349853700980766 + foodTwo: + rid: 9020349853700980767 + foodThree: + rid: 9020349853700980768 + foodsOne: + - rid: 9020349853700980769 + - rid: 9020349853700980770 + - rid: 9020349853700980771 + foodsTwo: + - rid: 9020349853700980772 + - rid: 9020349853700980773 + - rid: 9020349853700980774 + references: + version: 2 + RefIds: + - rid: 9020349853700980763 + type: {class: Apple, ns: , asm: Assembly-CSharp} + data: + name: Apple + kcal: 100 + - rid: 9020349853700980764 + type: {class: Peach, ns: , asm: Assembly-CSharp} + data: + name: Peach + kcal: 100 + - rid: 9020349853700980765 + type: {class: Grape, ns: , asm: Assembly-CSharp} + data: + name: Grape + kcal: 100 + - rid: 9020349853700980766 + type: {class: Apple, ns: , asm: Assembly-CSharp} + data: + name: Apple + kcal: 100 + - rid: 9020349853700980767 + type: {class: Peach, ns: , asm: Assembly-CSharp} + data: + name: Peach + kcal: 100 + - rid: 9020349853700980768 + type: {class: Grape, ns: , asm: Assembly-CSharp} + data: + name: Grape + kcal: 100 + - rid: 9020349853700980769 + type: {class: Apple, ns: , asm: Assembly-CSharp} + data: + name: Apple + kcal: 100 + - rid: 9020349853700980770 + type: {class: Peach, ns: , asm: Assembly-CSharp} + data: + name: Peach + kcal: 100 + - rid: 9020349853700980771 + type: {class: Grape, ns: , asm: Assembly-CSharp} + data: + name: Grape + kcal: 100 + - rid: 9020349853700980772 + type: {class: Apple, ns: , asm: Assembly-CSharp} + data: + name: Apple + kcal: 100 + - rid: 9020349853700980773 + type: {class: Peach, ns: , asm: Assembly-CSharp} + data: + name: Peach + kcal: 100 + - rid: 9020349853700980774 + type: {class: Grape, ns: , asm: Assembly-CSharp} + data: + name: Grape + kcal: 100 +--- !u!4 &586792173 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586792171} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1127138992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1127138994} + - component: {fileID: 1127138993} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1127138993 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127138992} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1127138994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127138992} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/Assets/Example/Example.unity.meta b/Assets/Example/Example.unity.meta new file mode 100644 index 0000000..2ce9a98 --- /dev/null +++ b/Assets/Example/Example.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: edbf6cf086198fc4dbd84a5a8d648144 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs index dbf3205..bec2c47 100644 --- a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs +++ b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs @@ -13,6 +13,11 @@ namespace MackySoft.SerializeReferenceExtensions.Editor { } public static Type GetType (string typeName) { + if (string.IsNullOrEmpty(typeName)) + { + return null; + } + int splitIndex = typeName.IndexOf(' '); var assembly = Assembly.Load(typeName.Substring(0,splitIndex)); return assembly.GetType(typeName.Substring(splitIndex + 1)); diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs new file mode 100644 index 0000000..9b3f6df --- /dev/null +++ b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs @@ -0,0 +1,52 @@ +#if UNITY_2019_3_OR_NEWER +using System; +using System.Collections.Generic; +using UnityEditor; +using System.Reflection; + +namespace MackySoft.SerializeReferenceExtensions.Editor +{ + public static class PropertyDrawerCache + { + + static readonly Dictionary s_Caches = new Dictionary(); + + public static bool TryGetPropertyDrawer (Type type,out PropertyDrawer drawer) + { + if (!s_Caches.TryGetValue(type,out drawer)) + { + Type drawerType = GetCustomPropertyDrawerType(type); + drawer = (drawerType != null) ? (PropertyDrawer)Activator.CreateInstance(drawerType) : null; + + s_Caches.Add(type, drawer); + } + return (drawer != null); + } + + static Type GetCustomPropertyDrawerType (Type type) + { + foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) + { + foreach (Type drawerType in assembly.GetTypes()) + { + var customPropertyDrawerAttributes = drawerType.GetCustomAttributes(typeof(CustomPropertyDrawer), true); + foreach (CustomPropertyDrawer customPropertyDrawer in customPropertyDrawerAttributes) + { + var field = customPropertyDrawer.GetType().GetField("m_Type", BindingFlags.NonPublic | BindingFlags.Instance); + if (field != null) + { + var fieldType = field.GetValue(customPropertyDrawer) as Type; + if (fieldType != null && fieldType == type) + { + return drawerType; + } + } + } + } + } + return null; + } + + } +} +#endif \ No newline at end of file diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs.meta b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs.meta new file mode 100644 index 0000000..0910a43 --- /dev/null +++ b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 075fe3cc9403a8947bc325d8515e9a69 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs index a0f198e..aba3b02 100644 --- a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs +++ b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs @@ -6,7 +6,8 @@ using UnityEngine; using UnityEditor; using UnityEditor.IMGUI.Controls; -namespace MackySoft.SerializeReferenceExtensions.Editor { +namespace MackySoft.SerializeReferenceExtensions.Editor +{ [CustomPropertyDrawer(typeof(SubclassSelectorAttribute))] public class SubclassSelectorDrawer : PropertyDrawer { @@ -46,8 +47,31 @@ namespace MackySoft.SerializeReferenceExtensions.Editor { popup.TypePopup.Show(popupPosition); } - // Draw the managed reference property. - EditorGUI.PropertyField(position,property,label,true); + // Check if a custom property drawer exists for this type. + PropertyDrawer customDrawer = GetCustomPropertyDrawer(property); + if (customDrawer != null) + { + // Draw the property with custom property drawer. + Rect foldoutRect = new Rect(position); + foldoutRect.height = EditorGUIUtility.singleLineHeight; + property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, label, true); + + if (property.isExpanded) + { + using (new EditorGUI.IndentLevelScope()) + { + Rect indentedRect = position; + float foldoutDifference = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + indentedRect.height = customDrawer.GetPropertyHeight(property, label); + indentedRect.y += foldoutDifference; + customDrawer.OnGUI(indentedRect, property, label); + } + } + } + else + { + EditorGUI.PropertyField(position, property, label, true); + } } else { EditorGUI.LabelField(position,label,k_IsNotManagedReferenceLabel); } @@ -55,6 +79,16 @@ namespace MackySoft.SerializeReferenceExtensions.Editor { EditorGUI.EndProperty(); } + PropertyDrawer GetCustomPropertyDrawer (SerializedProperty property) + { + Type propertyType = ManagedReferenceUtility.GetType(property.managedReferenceFullTypename); + if (propertyType != null && PropertyDrawerCache.TryGetPropertyDrawer(propertyType, out PropertyDrawer drawer)) + { + return drawer; + } + return null; + } + TypePopupCache GetTypePopup (SerializedProperty property) { // Cache this string. This property internally call Assembly.GetName, which result in a large allocation. string managedReferenceFieldTypename = property.managedReferenceFieldTypename; @@ -128,7 +162,15 @@ namespace MackySoft.SerializeReferenceExtensions.Editor { } public override float GetPropertyHeight (SerializedProperty property,GUIContent label) { - return EditorGUI.GetPropertyHeight(property,true); + PropertyDrawer customDrawer = GetCustomPropertyDrawer(property); + if (customDrawer != null) + { + return property.isExpanded ? EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing + customDrawer.GetPropertyHeight(property,label):EditorGUIUtility.singleLineHeight; + } + else + { + return property.isExpanded ? EditorGUI.GetPropertyHeight(property,true) : EditorGUIUtility.singleLineHeight; + } } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887..6397b32 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Example/Example.unity + guid: edbf6cf086198fc4dbd84a5a8d648144 m_configObjects: {}