Merge pull request #75 from mackysoft/feature/support-contravariance

Support contravariance/covariance

Author: mackysoft

Assets/Example/Example.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
   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_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 12
-  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
     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
@@ -104,7 +100,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +113,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -163,9 +159,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -199,13 +203,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 126803971}
+  serializedVersion: 2
   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:
@@ -326,13 +330,70 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 586792171}
+  serializedVersion: 2
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &994260143
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 994260145}
+  - component: {fileID: 994260144}
+  m_Layer: 0
+  m_Name: Example_Generics
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &994260144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 994260143}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dff76005e1dfac84287448b12c4b160e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  contravarianceActions:
+  - rid: 3354424774140624943
+  covarianceActions:
+  - rid: 3354424774140624944
+  references:
+    version: 2
+    RefIds:
+    - rid: 3354424774140624943
+      type: {class: DerivedAction1, ns: , asm: Assembly-CSharp}
+      data: 
+    - rid: 3354424774140624944
+      type: {class: NetworkActorAction1, ns: , asm: Assembly-CSharp}
+      data: 
+--- !u!4 &994260145
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 994260143}
+  serializedVersion: 2
   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:
@@ -359,9 +420,8 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1127138992}
   m_Enabled: 1
-  serializedVersion: 10
+  serializedVersion: 11
   m_Type: 1
-  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
@@ -420,11 +480,19 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1127138992}
+  serializedVersion: 2
   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}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 126803974}
+  - {fileID: 1127138994}
+  - {fileID: 586792173}
+  - {fileID: 994260145}

Assets/Example/Example_Generics.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+public interface IActor { }
+public interface IStandardActor : IActor { }
+public interface INetworkActor : IActor { }
+
+public interface IContravarianceAction<in T> where T : IActor {
+	void DoAction (T actor);
+}
+
+public interface ICovarianceAction<out T> where T : IActor
+{
+	T Actor { get; }
+}
+
+public interface IActorAction : IContravarianceAction<IActor>, ICovarianceAction<IActor> { }
+public interface IStandardActorAction : IContravarianceAction<IStandardActor>, ICovarianceAction<IStandardActor> { }
+public interface INetworkActorAction : IContravarianceAction<INetworkActor>, ICovarianceAction<INetworkActor> { }
+
+[Serializable]
+public sealed class StandardActorAction : IContravarianceAction<IStandardActor>, ICovarianceAction<IStandardActor>
+{
+	public void DoAction (IStandardActor actor)
+	{
+	}
+	public IStandardActor Actor => null;
+}
+
+[Serializable]
+public sealed class ActorAction : IContravarianceAction<IActor>, ICovarianceAction<IActor>
+{
+	public void DoAction (IActor actor)
+	{
+	}
+	public IActor Actor => null;
+}
+
+[Serializable]
+public abstract class BaseAction<T> : IContravarianceAction<T>, ICovarianceAction<T> where T : IActor
+{
+	public void DoAction (T actor) {
+	}
+	public T Actor => default;
+}
+
+[Serializable]
+public sealed class DerivedAction1 : BaseAction<IActor> { }
+
+[Serializable]
+public sealed class DerivedAction2 : BaseAction<INetworkActor> { }
+
+[Serializable]
+public sealed class DerivedAction3 : BaseAction<IStandardActor> { }
+
+[Serializable]
+public sealed class NetworkActorAction1 : INetworkActorAction
+{
+	public void DoAction (INetworkActor actor)
+	{
+	}
+	public INetworkActor Actor => null;
+}
+
+[Serializable]
+public sealed class NetworkActorAction2 : IContravarianceAction<INetworkActor>, ICovarianceAction<INetworkActor>
+{
+	public void DoAction (INetworkActor actor)
+	{
+	}
+	public INetworkActor Actor => null;
+}
+
+[Serializable]
+public sealed class NetworkActorAction3 : IContravarianceAction<IActor>, ICovarianceAction<IActor>
+{
+	public void DoAction (IActor actor)
+	{
+	}
+	public IActor Actor => null;
+}
+
+public class Example_Generics : MonoBehaviour
+{
+
+	[SerializeReference, SubclassSelector]
+	public List<IContravarianceAction<INetworkActor>> contravarianceActions = new List<IContravarianceAction<INetworkActor>>();
+
+	[SerializeReference, SubclassSelector]
+	public List<ICovarianceAction<INetworkActor>> covarianceActions = new List<ICovarianceAction<INetworkActor>>();
+
+}

Assets/Example/Example_Generics.cs.meta

@@ -149,7 +149,7 @@ TypePopupCache GetTypePopup (SerializedProperty property) {
 
 				Type baseType = ManagedReferenceUtility.GetType(managedReferenceFieldTypename);
 				var popup = new AdvancedTypePopup(
-					TypeMenuUtility.GetTypes(baseType),
+					TypeSearch.GetTypes(baseType),
 					k_MaxTypePopupLineCount,
 					state
 				);

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs

@@ -3,23 +3,11 @@
 using System.Collections.Generic;
 using UnityEditor;
 
-namespace MackySoft.SerializeReferenceExtensions.Editor {
+namespace MackySoft.SerializeReferenceExtensions.Editor
+{
 	public static class TypeMenuUtility {
 
 		public const string k_NullDisplayName = "<null>";
-		static readonly Type k_UnityObjectType = typeof(UnityEngine.Object);
-
-		public static IEnumerable<Type> GetTypes (Type baseType)
-		{
-			return TypeCache.GetTypesDerivedFrom(baseType).Append(baseType).Where(p =>
-				(p.IsPublic || p.IsNestedPublic || p.IsNestedPrivate) &&
-				!p.IsAbstract &&
-				!p.IsGenericType &&
-				!k_UnityObjectType.IsAssignableFrom(p) &&
-				Attribute.IsDefined(p, typeof(SerializableAttribute)) &&
-				!Attribute.IsDefined(p, typeof(HideInTypeMenuAttribute))
-			);
-		}
 
 		public static AddTypeMenuAttribute GetAttribute (Type type) {
 			return Attribute.GetCustomAttribute(type,typeof(AddTypeMenuAttribute)) as AddTypeMenuAttribute;