rebuild DLLs.

update unity version to Unity 2018.2.15f1.
fix Shader.PropertyToID error on Unity 5.x #26
2018-11-16 01:13:02 +09:00 · 2018-11-16 01:09:01 +09:00 · 2018-11-13 00:16:55 +09:00 · 2018-09-12 21:40:57 +09:00 · 2018-09-12 20:54:58 +09:00 · 2018-09-12 00:04:33 +09:00
9 changed files with 130 additions and 153 deletions
--- a/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity
+++ b/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 8
+  serializedVersion: 9
  m_Fog: 0
  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
  m_FogMode: 3
@@ -38,7 +38,8 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
@@ -54,11 +55,10 @@ LightmapSettings:
    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 1
  m_LightmapEditorSettings:
-    serializedVersion: 9
+    serializedVersion: 10
    m_Resolution: 2
    m_BakeResolution: 40
-    m_TextureWidth: 1024
-    m_TextureHeight: 1024
+    m_AtlasSize: 1024
    m_AO: 0
    m_AOMaxDistance: 1
    m_CompAOExponent: 1
@@ -77,15 +77,18 @@ LightmapSettings:
    m_PVRDirectSampleCount: 32
    m_PVRSampleCount: 500
    m_PVRBounces: 2
-    m_PVRFiltering: 0
+    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_PVRFilteringAtrousColorSigma: 1
-    m_PVRFilteringAtrousNormalSigma: 1
-    m_PVRFilteringAtrousPositionSigma: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ShowResolutionOverlay: 1
  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 0
 --- !u!196 &4
@@ -107,6 +110,8 @@ NavMeshSettings:
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
+    debug:
+      m_Flags: 0
  m_NavMeshData: {fileID: 0}
 --- !u!1001 &10684088
 Prefab:
@@ -173,33 +178,17 @@ Prefab:
      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2}
-  m_RootGameObject: {fileID: 106183784}
-  m_IsPrefabParent: 0
--- !u!1 &106183784
+  m_SourcePrefab: {fileID: 100100000, guid: de6f36e446e5e8a48bf61fe198985bb4, type: 2}
+  m_IsPrefabAsset: 0
+--- !u!1 &106183784 stripped
 GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 10684088}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 106183789}
-  - component: {fileID: 106183788}
-  - component: {fileID: 106183787}
-  - component: {fileID: 106183786}
-  - component: {fileID: 106183785}
-  m_Layer: 0
-  m_Name: Loupe
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!114 &106183785
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 106183784}
  m_Enabled: 1
@@ -209,84 +198,12 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  zoom: 10
  aspect: 1
--- !u!114 &106183786
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4,
-    type: 2}
-  m_PrefabInternal: {fileID: 10684088}
-  m_GameObject: {fileID: 106183784}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bb54a34570e4747429b1c5b66c69d356, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  invertX_: 0
-  invertY_: 0
-  useClip_: 0
-  clipPos: {x: 0, y: 0}
-  clipScale: {x: 0.2, y: 0.2}
--- !u!23 &106183787
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 23000011974915108, guid: de6f36e446e5e8a48bf61fe198985bb4,
-    type: 2}
-  m_PrefabInternal: {fileID: 10684088}
-  m_GameObject: {fileID: 106183784}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_Materials:
-  - {fileID: 2100000, guid: c181d333a7bee7a44b94c0f4e02c4bd4, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 1
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!33 &106183788
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 33000012841683532, guid: de6f36e446e5e8a48bf61fe198985bb4,
-    type: 2}
-  m_PrefabInternal: {fileID: 10684088}
-  m_GameObject: {fileID: 106183784}
-  m_Mesh: {fileID: 4300002, guid: d6b30b913257fee4d8246bf7a2620fcd, type: 3}
--- !u!4 &106183789
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4,
-    type: 2}
-  m_PrefabInternal: {fileID: 10684088}
-  m_GameObject: {fileID: 106183784}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.1, y: -2.91, z: 9.52}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &691659230
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 691659233}
  - component: {fileID: 691659232}
@@ -302,7 +219,7 @@ GameObject:
 TextMesh:
  serializedVersion: 3
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 691659230}
  m_Text: 'Tab: Next Screen     Shift + Tab: Previous Screen'
@@ -322,15 +239,17 @@ TextMesh:
 --- !u!23 &691659232
 MeshRenderer:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 691659230}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
  m_Materials:
  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
  m_StaticBatchInfo:
@@ -343,6 +262,7 @@ MeshRenderer:
  m_PreserveUVs: 0
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
@@ -354,7 +274,7 @@ MeshRenderer:
 --- !u!4 &691659233
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 691659230}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -367,10 +287,10 @@ Transform:
 --- !u!1 &813882971
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 1000012642892690, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 813882978}
  - component: {fileID: 813882977}
@@ -387,7 +307,7 @@ GameObject:
 --- !u!114 &813882972
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 813882971}
  m_Enabled: 1
@@ -398,7 +318,7 @@ MonoBehaviour:
 --- !u!114 &813882974
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 114000012274256594, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 813882971}
@@ -415,16 +335,18 @@ MonoBehaviour:
 --- !u!23 &813882975
 MeshRenderer:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 23000011974915108, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 23000011974915108, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 813882971}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
  m_Materials:
  - {fileID: 2100000, guid: c181d333a7bee7a44b94c0f4e02c4bd4, type: 2}
  m_StaticBatchInfo:
@@ -437,6 +359,7 @@ MeshRenderer:
  m_PreserveUVs: 1
  m_IgnoreNormalsForChartDetection: 0
  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
  m_SelectedEditorRenderState: 3
  m_MinimumChartSize: 4
  m_AutoUVMaxDistance: 0.5
@@ -448,7 +371,7 @@ MeshRenderer:
 --- !u!33 &813882977
 MeshFilter:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 33000012841683532, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 33000012841683532, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 813882971}
@@ -456,23 +379,23 @@ MeshFilter:
 --- !u!4 &813882978
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4,
+  m_CorrespondingSourceObject: {fileID: 4000011474108562, guid: de6f36e446e5e8a48bf61fe198985bb4,
    type: 2}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 813882971}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 10}
  m_LocalScale: {x: 1.92, y: 1.08, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1874811380
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 1874811385}
  - component: {fileID: 1874811384}
@@ -489,34 +412,38 @@ GameObject:
 --- !u!81 &1874811381
 AudioListener:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1874811380}
  m_Enabled: 1
 --- !u!124 &1874811382
 Behaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1874811380}
  m_Enabled: 1
 --- !u!92 &1874811383
 Behaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1874811380}
  m_Enabled: 1
 --- !u!20 &1874811384
 Camera:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1874811380}
  m_Enabled: 1
  serializedVersion: 2
  m_ClearFlags: 1
  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
+  m_projectionMatrixMode: 1
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
@@ -538,15 +465,15 @@ Camera:
  m_TargetEye: 3
  m_HDR: 0
  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
  m_ForceIntoRT: 0
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!4 &1874811385
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1874811380}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -559,9 +486,9 @@ Transform:
 --- !u!1 &1895115489
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 1895115491}
  - component: {fileID: 1895115490}
@@ -575,7 +502,7 @@ GameObject:
 --- !u!108 &1895115490
 Light:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1895115489}
  m_Enabled: 1
@@ -602,22 +529,9 @@ Light:
    serializedVersion: 2
    m_Bits: 4294967295
  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
  m_AreaSize: {x: 1, y: 1}
  m_BounceIntensity: 1
-  m_FalloffTable:
-    m_Table[0]: 0
-    m_Table[1]: 0
-    m_Table[2]: 0
-    m_Table[3]: 0
-    m_Table[4]: 0
-    m_Table[5]: 0
-    m_Table[6]: 0
-    m_Table[7]: 0
-    m_Table[8]: 0
-    m_Table[9]: 0
-    m_Table[10]: 0
-    m_Table[11]: 0
-    m_Table[12]: 0
  m_ColorTemperature: 6570
  m_UseColorTemperature: 0
  m_ShadowRadius: 0
@@ -625,7 +539,7 @@ Light:
 --- !u!4 &1895115491
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1895115489}
  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
--- a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll
+++ b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll
--- a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
+++ b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
--- a/Assets/uDesktopDuplication/Scripts/Manager.cs
+++ b/Assets/uDesktopDuplication/Scripts/Manager.cs
@@ -62,8 +62,13 @@ public class Manager : MonoBehaviour
    private float reinitializationTimer_ = 0f;
    private bool isFirstFrame_ = true;

-    public static event Lib.DebugLogDelegate onDebugLog = msg => Debug.Log(msg);
-    public static event Lib.DebugLogDelegate onDebugErr = msg => Debug.LogError(msg);
+    public static event Lib.DebugLogDelegate onDebugLog = OnDebugLog;
+    public static event Lib.DebugLogDelegate onDebugErr = OnDebugErr;
+
+    [AOT.MonoPInvokeCallback(typeof(Lib.DebugLogDelegate))]
+    private static void OnDebugLog(string msg) { Debug.Log(msg); }
+    [AOT.MonoPInvokeCallback(typeof(Lib.DebugLogDelegate))]
+    private static void OnDebugErr(string msg) { Debug.LogError(msg); }

    public delegate void ReinitializeHandler();
    public static event ReinitializeHandler onReinitialized;
--- a/Assets/uDesktopDuplication/Scripts/Texture.cs
+++ b/Assets/uDesktopDuplication/Scripts/Texture.cs
@@ -240,6 +240,13 @@ public class Texture : MonoBehaviour
        }
    }

+    int clipPositionScaleKey_;
+
+    void Awake()
+    {
+        clipPositionScaleKey_ = Shader.PropertyToID("_ClipPositionScale");
+    }
+
    void OnEnable()
    {
        if (monitor == null) {
@@ -271,8 +278,7 @@ public class Texture : MonoBehaviour

    void RequireUpdate()
    {
-        if (monitor != null)
-        {
+        if (monitor != null) {
            monitor.shouldBeUpdated = true;
        }
    }
@@ -283,7 +289,6 @@ public class Texture : MonoBehaviour
        monitor = Manager.GetMonitor(lastMonitorId_);
    }

-    int clipPositionScaleKey_ = Shader.PropertyToID("_ClipPositionScale");
    void UpdateMaterial()
    {
        width = transform.localScale.x;
@@ -409,6 +414,19 @@ public class Texture : MonoBehaviour
        // Calculate coordinates.
        var coordX = toAngle / halfWidthAngle * 0.5f;
        var coordY = ly / halfHeight * 0.5f;
+
+        // Zoom
+        if (useClip) {
+            coordX = clipPos.x + (0.5f + coordX) * clipScale.x;
+            coordX -= Mathf.Floor(coordX);
+            coordX -= 0.5f;
+
+            coordY = (1f - clipPos.y) + (coordY - 0.5f) * clipScale.y;
+            coordY -= Mathf.Floor(coordY);
+            coordY -= 0.5f;
+        }
+
+        // Desktop position
        int desktopX = monitor.left + (int)((coordX + 0.5f) * monitor.width);
        int desktopY = monitor.top + (int)((0.5f - coordY) * monitor.height);

--- a/Plugins/uDesktopDuplication/uDesktopDuplication.sln
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication.sln
@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uDesktopDuplication", "uDesktopDuplication\uDesktopDuplication.vcxproj", "{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|Win32.Build.0 = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x64.ActiveCfg = Debug|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x64.Build.0 = Debug|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x86.ActiveCfg = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Debug|x86.Build.0 = Debug|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|Win32.ActiveCfg = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|Win32.Build.0 = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x64.ActiveCfg = Release|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x64.Build.0 = Release|x64
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x86.ActiveCfg = Release|Win32
+		{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
@@ -77,7 +77,13 @@ void Monitor::Render()

    if (unityTexture_ == nullptr) 
    {
-        Debug::Error("Monitor::Render() => Target texture has not been set yet..");
+        Debug::Error("Monitor::Render() => Target texture has not been set yet.");
+        return;
+    }
+
+    if (!frame.texture)
+    {
+        Debug::Error("Monitor::Render() => frame doesn't have texture.");
        return;
    }

--- a/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj
@@ -28,26 +28,26 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.1.9f1
+m_EditorVersion: 2018.2.15f1
Author	SHA1	Message	Date
hecomi	4c225c21c9	rebuild DLLs.	2018-11-16 01:13:02 +09:00
hecomi	b8b4238b5f	update unity version to Unity 2018.2.15f1.	2018-11-16 01:09:01 +09:00
hecomi	4d2766ce3f	fix Shader.PropertyToID error on Unity 5.x #26	2018-11-13 00:16:55 +09:00
hecomi	f4096ec9fb	fix crash bug caused by Windows sleep.	2018-09-12 21:40:57 +09:00
hecomi	0f43788650	add solution file.	2018-09-12 20:54:58 +09:00
hecomi	1c1381a7ba	consider clipPos and clipScale for raycast #23 .	2018-09-12 00:04:33 +09:00
hecomi	08903cd27a	fix orientation of monitor object in Zoom scene.	2018-09-12 00:03:36 +09:00
hecomi	d840983829	update Unity version to 2018.2.7f1.	2018-09-12 00:03:01 +09:00
hecomi	8a6cee9c2d	Merge pull request #24 from dj-kusuha/fix_il2cpp_runtime_error fixed a runtime error when using the IL2CPP scripting backend	2018-09-11 21:36:08 +09:00
dj-kusuha	f7798f752f	fixed a runtime error when using the IL2CPP scripting backend	2018-09-11 11:27:43 +09:00