Merge branch 'develop'

ialex32x · Aug 1, 2019 · 7add61d · 7add61d
2 parents ee600f5 + 5baf85d
commit 7add61d
Show file tree

Hide file tree

Showing 5 changed files with 343 additions and 14 deletions.
diff --git a/unity/Assets/Duktape/Editor/BindingManager.cs b/unity/Assets/Duktape/Editor/BindingManager.cs
@@ -351,6 +351,16 @@ public TypeTransform AddExportedType(Type type)
                 var typeBindingInfo = new TypeBindingInfo(this, type);
                 exportedTypes.Add(type, typeBindingInfo);
                 log.AppendLine($"AddExportedType: {type} Assembly: {type.Assembly}");
+
+                // 检查具体化泛型基类 (如果基类泛型定义在显式导出清单中, 那么导出此具体化类)
+                var baseType = type.BaseType;
+                if (baseType != null && baseType.IsConstructedGenericType)
+                {
+                    if (!IsExportingBlocked(baseType) && IsExportingExplicit(baseType.GetGenericTypeDefinition()))
+                    {
+                        AddExportedType(baseType);
+                    }
+                }
             }
             return TransformType(type);
         }
@@ -785,7 +795,7 @@ public bool IsExportingBlocked(Type type)
             {
                 return true;
             }
-            if (type.IsGenericType)
+            if (type.IsGenericType && !type.IsConstructedGenericType)
             {
                 return true;
             }

diff --git a/unity/Assets/Examples/Scenes/snippets.unity b/unity/Assets/Examples/Scenes/snippets.unity
@@ -0,0 +1,278 @@
+%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.44657844, g: 0.49641222, b: 0.57481694, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 0
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 1
+    m_EnableRealtimeLightmaps: 1
+  m_LightmapEditorSettings:
+    serializedVersion: 10
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 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: 500
+    m_PVRBounces: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 1
+--- !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
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &604326091
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 604326093}
+  - component: {fileID: 604326092}
+  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 &604326092
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 604326091}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  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_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &604326093
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 604326091}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1796460944
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1796460948}
+  - component: {fileID: 1796460947}
+  - component: {fileID: 1796460946}
+  - component: {fileID: 1796460945}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1796460945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1796460944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f13329a15afae7448f4cc6fd0d3e331, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!81 &1796460946
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1796460944}
+  m_Enabled: 1
+--- !u!20 &1796460947
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1796460944}
+  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_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_GateFitMode: 2
+  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 &1796460948
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1796460944}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/unity/Assets/Examples/Scenes/snippets.unity.meta b/unity/Assets/Examples/Scenes/snippets.unity.meta
diff --git a/unity/Assets/Examples/Source/CodeSnippets.cs b/unity/Assets/Examples/Source/CodeSnippets.cs
@@ -145,7 +145,7 @@ void testConstant(FieldInfo field)
     }
 
     public static void testTypeByRefMethod(ref string p)
-    {}
+    { }
 
     void testTypeByRef(MethodInfo method)
     {
@@ -160,19 +160,37 @@ void testTypeByRef(MethodInfo method)
         }
     }
 
+    void testConcreteSubType()
+    {
+        var gb = new StringGB();
+        gb.Foo("fff");
+        var type = typeof(StringGB);
+        var bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static;
+        var methods = type.GetMethods(bindingFlags);
+        foreach (var m in methods)
+        {
+            Debug.Log($"Method: {m} ({m.DeclaringType})");
+        }
+        var baseType = type.BaseType;
+        Debug.Log($"IsConstructedGenericType: {baseType.IsConstructedGenericType}");
+        var jsTypeAttr = baseType.GetGenericTypeDefinition().IsDefined(typeof(Duktape.JSTypeAttribute), false);
+        Debug.Log($"GetGenericTypeDefinition: {baseType.GetGenericTypeDefinition()} ({jsTypeAttr})");
+    }
+
     void Awake()
     {
-        testTypeByRef(GetType().GetMethod("testTypeByRefMethod"));
-        testConstant(GetType().GetField("constant"));
-        testConstant(GetType().GetField("constantInt"));
-        testConstant(GetType().GetField("constantSingle"));
-        testPointer(typeof(long*));
-        testPointer(typeof(IntPtr));
-        testInnerType(typeof(InnerType));
-        testVarargs(null);
-        testEmptyArray();
-        testTypes();
-        testDelegates();
-        testGenericTypes();
+        // testTypeByRef(GetType().GetMethod("testTypeByRefMethod"));
+        // testConstant(GetType().GetField("constant"));
+        // testConstant(GetType().GetField("constantInt"));
+        // testConstant(GetType().GetField("constantSingle"));
+        // testPointer(typeof(long*));
+        // testPointer(typeof(IntPtr));
+        // testInnerType(typeof(InnerType));
+        // testVarargs(null);
+        // testEmptyArray();
+        // testTypes();
+        // testDelegates();
+        // testGenericTypes();
+        testConcreteSubType();
     }
 }
diff --git a/unity/Assets/Examples/Source/SampleClass.cs b/unity/Assets/Examples/Source/SampleClass.cs
@@ -10,6 +10,22 @@ public enum SampleEnum
     a, b, c
 }
 
+// 泛型类本身不能导出
+// 但 从泛型类具体化继承的类 导出时将据此判断是否自动导出 具体化的泛型类
+[Duktape.JSType]
+public class GB<T>
+{
+    public void Foo(T t)
+    {
+        Debug.Log($"{t.GetType()}: {t.ToString()}");
+    }
+}
+
+[Duktape.JSType]
+public class StringGB : GB<string>
+{
+}
+
 namespace SampleNamespace
 {
     [Duktape.JSType]