fix bug that caused darker screen #22 .

update Unity version to 2018.1.
remove unnecessary line break.
2018-08-05 00:20:03 +09:00 · 2018-08-05 00:19:07 +09:00 · 2018-08-05 00:18:42 +09:00 · 2018-05-20 15:53:30 +09:00 · 2018-05-20 02:08:18 +09:00 · 2018-05-20 01:11:03 +09:00
23 changed files with 330 additions and 206 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 /[Bb]uild/
 /[Ww]iki/
 /[Mm]isc/
+/UnityPackageManager
+/Packages

 # Autogenerated VS/MD solution and project files
 *.csproj
@@ -28,3 +30,4 @@ sysinfo.txt
 /Assets/AssetStoreTools*
 /Assets/Extensions*
 /uDesktopDuplication.log
+.vs
--- a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat
+++ b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat
@@ -8,84 +8,51 @@ Material:
  m_PrefabInternal: {fileID: 0}
  m_Name: uDD_Screen_Unlit
  m_Shader: {fileID: 4800000, guid: 2ca7b38c676bddd439a77a646a279a54, type: 3}
-  m_ShaderKeywords: _CULL_BACK _EMISSION _FORWARD_Z _USEBEND_ON
+  m_ShaderKeywords: _CULL_BACK _EMISSION _FORWARD_Y _USEBEND_ON
  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
-  disabledShaderPasses: []
  m_SavedProperties:
-    serializedVersion: 3
+    serializedVersion: 2
    m_TexEnvs:
-    - _BumpMap:
+    - first:
+        name: <noninit>
+      second:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _CursorTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
+    - first:
+        name: _MainTex
+      second:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    m_Floats:
-    - PixelSnap: 0
-    - _Bend: 0
-    - _BumpScale: 1
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _Forward: 1
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _InvFade: 1
-    - _InvertX: 1
-    - _InvertY: 0
-    - _Mask: 0.653
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 10
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Thickness: 1
-    - _UVSec: 0
-    - _UseBend: 0
-    - _Width: 1
-    - _ZWrite: 1
+    - first:
+        name: <noninit>
+      second: 0
+    - first:
+        name: _Bend
+      second: 0
+    - first:
+        name: _Cull
+      second: 2
+    - first:
+        name: _Forward
+      second: 0
+    - first:
+        name: _Radius
+      second: 30
+    - first:
+        name: _Thickness
+      second: 1
+    - first:
+        name: _Width
+      second: 1
    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - first:
+        name: <noninit>
+      second: {r: 0, g: 1.3912242e-34, b: 0, a: 1.3912168e-34}
+    - first:
+        name: _Color
+      second: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll
+++ b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll
--- a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta
+++ b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta
@@ -25,6 +25,12 @@ PluginImporter:
          Exclude OSXUniversal: 0
          Exclude Win: 0
          Exclude Win64: 1
+    data:
+      first:
+        '': data
+      second:
+        enabled: 0
+        settings: {}
    data:
      first:
        Android: Android
@@ -37,7 +43,17 @@ PluginImporter:
        Any: 
      second:
        enabled: 1
-        settings: {}
+        settings:
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude WebGL: 0
+          Exclude Win: 0
+          Exclude Win64: 1
    data:
      first:
        Editor: Editor
@@ -46,7 +62,13 @@ PluginImporter:
        settings:
          CPU: x86
          DefaultValueInitialized: true
-          OS: Windows
+          OS: AnyOS
+    data:
+      first:
+        Facebook: WebGL
+      second:
+        enabled: 1
+        settings: {}
    data:
      first:
        Facebook: Win
@@ -117,6 +139,12 @@ PluginImporter:
        enabled: 0
        settings:
          CPU: None
+    data:
+      first:
+        WebGL: WebGL
+      second:
+        enabled: 1
+        settings: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
+++ b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll
--- a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta
+++ b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta
@@ -9,20 +9,66 @@ PluginImporter:
  isPreloaded: 0
  isOverridable: 0
  platformData:
+    data:
+      first:
+        '': Any
+      second:
+        enabled: 0
+        settings:
+          Exclude Android: 0
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude Win: 1
+          Exclude Win64: 0
+    data:
+      first:
+        '': data
+      second:
+        enabled: 0
+        settings: {}
+    data:
+      first:
+        Android: Android
+      second:
+        enabled: 1
+        settings:
+          CPU: ARMv7
    data:
      first:
        Any: 
      second:
        enabled: 1
-        settings: {}
+        settings:
+          Exclude Editor: 0
+          Exclude Linux: 0
+          Exclude Linux64: 0
+          Exclude LinuxUniversal: 0
+          Exclude OSXIntel: 0
+          Exclude OSXIntel64: 0
+          Exclude OSXUniversal: 0
+          Exclude WebGL: 0
+          Exclude Win: 1
+          Exclude Win64: 0
    data:
      first:
        Editor: Editor
      second:
-        enabled: 0
+        enabled: 1
        settings:
          CPU: x86_64
          DefaultValueInitialized: true
+          OS: AnyOS
+    data:
+      first:
+        Facebook: WebGL
+      second:
+        enabled: 1
+        settings: {}
    data:
      first:
        Facebook: Win
@@ -41,7 +87,7 @@ PluginImporter:
      first:
        Standalone: Linux
      second:
-        enabled: 0
+        enabled: 1
        settings:
          CPU: None
    data:
@@ -57,12 +103,12 @@ PluginImporter:
      second:
        enabled: 1
        settings:
-          CPU: x86_64
+          CPU: AnyCPU
    data:
      first:
        Standalone: OSXIntel
      second:
-        enabled: 0
+        enabled: 1
        settings:
          CPU: None
    data:
@@ -76,9 +122,9 @@ PluginImporter:
      first:
        Standalone: OSXUniversal
      second:
-        enabled: 0
+        enabled: 1
        settings:
-          CPU: x86_64
+          CPU: AnyCPU
    data:
      first:
        Standalone: Win
@@ -93,6 +139,12 @@ PluginImporter:
        enabled: 1
        settings:
          CPU: AnyCPU
+    data:
+      first:
+        WebGL: WebGL
+      second:
+        enabled: 1
+        settings: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/uDesktopDuplication/Scripts/Manager.cs
+++ b/Assets/uDesktopDuplication/Scripts/Manager.cs
@@ -99,6 +99,12 @@ public class Manager : MonoBehaviour
        Lib.Initialize();

        CreateMonitors();
+
+        #if UNITY_2018_1_OR_NEWER
+        Shader.DisableKeyword("USE_GAMMA_TO_LINEAR_SPACE");
+        #else
+        Shader.EnableKeyword("USE_GAMMA_TO_LINEAR_SPACE");
+        #endif
    }

    void OnApplicationQuit()
--- a/Assets/uDesktopDuplication/Scripts/Texture.cs
+++ b/Assets/uDesktopDuplication/Scripts/Texture.cs
@@ -283,13 +283,16 @@ public class Texture : MonoBehaviour
        monitor = Manager.GetMonitor(lastMonitorId_);
    }

+    int clipPositionScaleKey_ = Shader.PropertyToID("_ClipPositionScale");
    void UpdateMaterial()
    {
        width = transform.localScale.x;
+
        if (monitor != null) {
            rotation = monitor.rotation;
        }
-        material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
+
+        material.SetVector(clipPositionScaleKey_, new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y));
    }

    public Vector3 GetWorldPositionFromCoord(Vector2 coord)
--- a/Assets/uDesktopDuplication/Shaders/uDD_Common.cginc
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Common.cginc
@@ -58,9 +58,11 @@ inline float2 uddClipUV(float2 uv)

 inline void uddConvertToLinearIfNeeded(inout fixed3 rgb)
 {
+#ifdef USE_GAMMA_TO_LINEAR_SPACE
    if (!IsGammaSpace()) {
        rgb = GammaToLinearSpace(rgb);
    }
+#endif
 }

 inline fixed4 uddGetTexture(sampler2D tex, float2 uv)
--- a/Assets/uDesktopDuplication/Shaders/uDD_Standard.shader
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Standard.shader
@@ -31,6 +31,7 @@ SubShader
    #pragma multi_compile ___ USE_CLIP
    #pragma multi_compile ___ BEND_ON
    #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE

    #define SURFACE_SHADER
    #include "./uDD_Common.cginc"
--- a/Assets/uDesktopDuplication/Shaders/uDD_Unlit.shader
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Unlit.shader
@@ -55,6 +55,7 @@ Pass
    #pragma multi_compile ___ USE_CLIP
    #pragma multi_compile ___ BEND_ON
    #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
    ENDCG
 }

--- a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_BlackMask.shader
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_BlackMask.shader
@@ -61,6 +61,7 @@ Pass
    #pragma multi_compile ___ USE_CLIP
    #pragma multi_compile ___ BEND_ON
    #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
    ENDCG
 }

--- a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader
@@ -168,6 +168,7 @@ Pass
    #pragma multi_compile ___ USE_CLIP
    #pragma multi_compile ___ BEND_ON
    #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
    ENDCG
 }

--- a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Transparent.shader
+++ b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Transparent.shader
@@ -57,6 +57,7 @@ Pass
    #pragma multi_compile ___ USE_CLIP
    #pragma multi_compile ___ BEND_ON
    #pragma multi_compile _FORWARD_Y _FORWARD_Z
+    #pragma multi_compile ___ USE_GAMMA_TO_LINEAR_SPACE
    ENDCG
 }

--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.cpp
@@ -46,7 +46,8 @@ void Duplicator::InitializeDevice()
 void Duplicator::InitializeDuplication()
 {
 	ComPtr<IDXGIOutput1> output1;
-	if (FAILED(monitor_->GetOutput().As(&output1))) {
+	if (FAILED(monitor_->GetOutput().As(&output1))) 
+    {
 		return;
 	}

@@ -237,6 +238,8 @@ void Duplicator::Duplicate(UINT timeout)
 {
    if (!dupl_ || !device_) return;

+    Release();
+
    ComPtr<IDXGIResource> resource;
    DXGI_OUTDUPL_FRAME_INFO frameInfo;
    const auto hr = dupl_->AcquireNextFrame(timeout, &frameInfo, &resource);
@@ -279,33 +282,7 @@ void Duplicator::Duplicate(UINT timeout)
        return;
    }

-    ScopedReleaser releaser([this] 
-    {
-        const auto hr = dupl_->ReleaseFrame();
-        if (FAILED(hr))
-        {
-            switch (hr)
-            {
-                case DXGI_ERROR_ACCESS_LOST:
-                {
-                    Debug::Log("Duplicator::Duplicate() => DXGI_ERROR_ACCESS_LOST.");
-                    state_ = State::AccessLost;
-                    break;
-                }
-                case DXGI_ERROR_INVALID_CALL:
-                {
-                    Debug::Error("Duplicator::Duplicate() => DXGI_ERROR_INVALID_CALL.");
-                    break;
-                }
-                default:
-                {
-                    state_ = State::Unknown;
-                    Debug::Error("Duplicator::Duplicate() => Unknown Error.");
-                    break;
-                }
-            }
-        }
-    });
+    isFrameAcquired_ = true;

    ComPtr<ID3D11Texture2D> texture;
    if (FAILED(resource.As(&texture))) 
@@ -343,6 +320,39 @@ void Duplicator::Duplicate(UINT timeout)
 }


+void Duplicator::Release()
+{
+    if (!isFrameAcquired_) return;
+
+    const auto hr = dupl_->ReleaseFrame();
+    if (FAILED(hr))
+    {
+        switch (hr)
+        {
+            case DXGI_ERROR_ACCESS_LOST:
+            {
+                Debug::Log("Duplicator::Duplicate() => DXGI_ERROR_ACCESS_LOST.");
+                state_ = State::AccessLost;
+                break;
+            }
+            case DXGI_ERROR_INVALID_CALL:
+            {
+                Debug::Error("Duplicator::Duplicate() => DXGI_ERROR_INVALID_CALL.");
+                break;
+            }
+            default:
+            {
+                state_ = State::Unknown;
+                Debug::Error("Duplicator::Duplicate() => Unknown Error.");
+                break;
+            }
+        }
+    }
+
+    isFrameAcquired_ = false;
+}
+
+
 void Duplicator::UpdateCursor(
    const ComPtr<ID3D11Texture2D>& texture,
    const DXGI_OUTDUPL_FRAME_INFO& frameInfo)
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Duplicator.h
@@ -68,6 +68,7 @@ private:
    void CheckUnityAdapter();

    void Duplicate(UINT timeout);
+    void Release();

    void UpdateCursor(
        const Microsoft::WRL::ComPtr<ID3D11Texture2D>& texture,
@@ -83,6 +84,7 @@ private:
    Microsoft::WRL::ComPtr<IDXGIOutputDuplication> dupl_;
    Frame lastFrame_;
    UINT lastFrameId_ = 0;
+    bool isFrameAcquired_ = false;

    volatile bool shouldRun_ = false;
    std::thread thread_;
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Monitor.cpp
@@ -75,32 +75,35 @@ void Monitor::Render()
    if (frame.id == lastFrameId_) return;
    lastFrameId_ = frame.id;

-	if (unityTexture_)
-	{
-		D3D11_TEXTURE2D_DESC srcDesc, dstDesc;
-		frame.texture->GetDesc(&srcDesc);
-		unityTexture_->GetDesc(&dstDesc);
-		if (srcDesc.Width  != dstDesc.Width ||
-			srcDesc.Height != dstDesc.Height)
-		{
-			Debug::Error("Monitor::Render() => Texture sizes are defferent.");
-			Debug::Error("    Source : (", srcDesc.Width, ", ", srcDesc.Height, ")");
-			Debug::Error("    Dest   : (", dstDesc.Width, ", ", dstDesc.Height, ")");
-            return;
-		}
-		else
-		{
-			ComPtr<ID3D11DeviceContext> context;
-			GetDevice()->GetImmediateContext(&context);
-			context->CopyResource(unityTexture_, frame.texture.Get());
+    if (unityTexture_ == nullptr) 
+    {
+        Debug::Error("Monitor::Render() => Target texture has not been set yet..");
+        return;
+    }

-            auto& manager = GetMonitorManager();
-            if (id_ == manager->GetCursorMonitorId())
-            {
-                manager->GetCursor()->Draw(unityTexture_);
-            }
-		}
-	}
+    D3D11_TEXTURE2D_DESC srcDesc, dstDesc;
+    frame.texture->GetDesc(&srcDesc);
+    unityTexture_->GetDesc(&dstDesc);
+    if (srcDesc.Width  != dstDesc.Width ||
+        srcDesc.Height != dstDesc.Height)
+    {
+        Debug::Error("Monitor::Render() => Texture sizes are defferent.");
+        Debug::Error("    Source : (", srcDesc.Width, ", ", srcDesc.Height, ")");
+        Debug::Error("    Dest   : (", dstDesc.Width, ", ", dstDesc.Height, ")");
+        return;
+    }
+    else
+    {
+        ComPtr<ID3D11DeviceContext> context;
+        GetDevice()->GetImmediateContext(&context);
+        context->CopyResource(unityTexture_, frame.texture.Get());
+
+        auto& manager = GetMonitorManager();
+        if (id_ == manager->GetCursorMonitorId())
+        {
+            manager->GetCursor()->Draw(unityTexture_);
+        }
+    }

 	if (UseGetPixels())
 	{
@@ -455,7 +458,6 @@ bool Monitor::GetPixels(BYTE* output, int x, int y, int width, int height)
            const auto outCol = col;
            const auto outIndex = 4 * (outRow * width + outCol);

-
            // BGRA -> RGBA
            output[outIndex + 0] = bufferForGetPixels_[inIndex + 2];
            output[outIndex + 1] = bufferForGetPixels_[inIndex + 1];
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp
@@ -42,14 +42,16 @@ extern "C"
 			auto device = g_unity->Get<IUnityGraphicsD3D11>()->GetDevice();

 			Microsoft::WRL::ComPtr<IDXGIDevice1> dxgiDevice;
-			if (FAILED(device->QueryInterface(IID_PPV_ARGS(&dxgiDevice)))){
-				Debug::Error("fatal");
+			if (FAILED(device->QueryInterface(IID_PPV_ARGS(&dxgiDevice))))
+            {
+				Debug::Error("Initialize() => device->QueryInterface() failed.");
 				return;
 			}

 			Microsoft::WRL::ComPtr<IDXGIAdapter> dxgiAdapter;
-			if (FAILED(dxgiDevice->GetAdapter(&dxgiAdapter))) {
-				Debug::Error("fatal");
+			if (FAILED(dxgiDevice->GetAdapter(&dxgiAdapter))) 
+            {
+				Debug::Error("Initialize() => dxgiDevice->GetAdapter() failed.");
 				return;
 			}

--- a/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -21,33 +21,33 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{BC5DE2F9-BDCC-4449-A017-E5642E04BB56}</ProjectGuid>
    <RootNamespace>uDesktopDuplication</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
    <ProjectName>uDesktopDuplication</ProjectName>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 9
  m_Deferred:
    m_Mode: 1
    m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -39,24 +39,26 @@ GraphicsSettings:
  m_PreloadedShaders: []
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
    type: 0}
-  m_CustomRenderPipeline: {fileID: 0}
-  m_TransparencySortMode: 0
-  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
+  m_TierSettings_Tier1:
+    renderingPath: 1
+    useCascadedShadowMaps: 1
+  m_TierSettings_Tier2:
+    renderingPath: 1
+    useCascadedShadowMaps: 1
+  m_TierSettings_Tier3:
+    renderingPath: 1
+    useCascadedShadowMaps: 1
  m_DefaultRenderingPath: 1
  m_DefaultMobileRenderingPath: 1
  m_TierSettings: []
  m_LightmapStripping: 0
  m_FogStripping: 0
-  m_InstancingStripping: 0
  m_LightmapKeepPlain: 1
  m_LightmapKeepDirCombined: 1
+  m_LightmapKeepDirSeparate: 1
  m_LightmapKeepDynamicPlain: 1
  m_LightmapKeepDynamicDirCombined: 1
-  m_LightmapKeepShadowMask: 1
-  m_LightmapKeepSubtractive: 1
+  m_LightmapKeepDynamicDirSeparate: 1
  m_FogKeepLinear: 1
  m_FogKeepExp: 1
  m_FogKeepExp2: 1
-  m_AlbedoSwatchInfos: []
-  m_LightsUseLinearIntensity: 0
-  m_LightsUseColorTemperature: 0
--- a/ProjectSettings/PresetManager.asset
+++ b/ProjectSettings/PresetManager.asset
@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  m_DefaultList: []
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -3,9 +3,11 @@
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 15
  productGUID: 277c1ac997a1aee4b8be703242534216
  AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
+  AndroidEnableSustainedPerformanceMode: 0
  defaultScreenOrientation: 4
  targetDevice: 2
  useOnDemandResources: 0
@@ -14,7 +16,7 @@ PlayerSettings:
  productName: uDesktopDuplication
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
-  m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
+  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
  m_ShowUnitySplashScreen: 1
  m_ShowUnitySplashLogo: 1
  m_SplashScreenOverlayOpacity: 1
@@ -38,8 +40,6 @@ PlayerSettings:
    width: 1
    height: 1
  m_SplashScreenLogos: []
-  m_SplashScreenBackgroundLandscape: {fileID: 0}
-  m_SplashScreenBackgroundPortrait: {fileID: 0}
  m_VirtualRealitySplashScreen: {fileID: 0}
  m_HolographicTrackingLossScreen: {fileID: 0}
  defaultScreenWidth: 1024
@@ -49,7 +49,6 @@ PlayerSettings:
  m_StereoRenderingPath: 0
  m_ActiveColorSpace: 1
  m_MTRendering: 1
-  m_MobileMTRendering: 0
  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
@@ -63,14 +62,18 @@ PlayerSettings:
  allowedAutorotateToLandscapeLeft: 1
  useOSAutorotation: 1
  use32BitDisplayBuffer: 1
+  preserveFramebufferAlpha: 0
  disableDepthAndStencilBuffers: 0
-  defaultIsFullScreen: 1
+  androidBlitType: 0
  defaultIsNativeResolution: 1
+  macRetinaSupport: 1
  runInBackground: 1
  captureSingleScreen: 0
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
  Force IOS Speakers When Recording: 0
+  deferSystemGesturesMode: 0
+  hideHomeButton: 0
  submitAnalytics: 1
  usePlayerLog: 1
  bakeCollisionMeshes: 0
@@ -88,32 +91,26 @@ PlayerSettings:
  visibleInBackground: 0
  allowFullscreenSwitch: 1
  graphicsJobMode: 0
-  macFullscreenMode: 2
-  d3d9FullscreenMode: 1
-  d3d11FullscreenMode: 1
+  fullscreenMode: 1
  xboxSpeechDB: 0
  xboxEnableHeadOrientation: 0
  xboxEnableGuest: 0
  xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
  n3dsDisableStereoscopicView: 0
  n3dsEnableSharedListOpt: 1
  n3dsEnableVSync: 0
-  ignoreAlphaClear: 0
  xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
  xboxOneMonoLoggingLevel: 0
  xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOnePresentImmediateThreshold: 0
+  switchQueueCommandMemory: 0
  videoMemoryForVertexBuffers: 0
  psp2PowerMode: 0
  psp2AcquireBGM: 1
-  wiiUTVResolution: 0
-  wiiUGamePadMSAA: 1
-  wiiUSupportsNunchuk: 0
-  wiiUSupportsClassicController: 0
-  wiiUSupportsBalanceBoard: 0
-  wiiUSupportsMotionPlus: 0
-  wiiUSupportsProController: 0
-  wiiUAllowScreenCapture: 1
-  wiiUControllerCount: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
@@ -123,6 +120,7 @@ PlayerSettings:
  bundleVersion: 1.0
  preloadedAssets: []
  metroInputSource: 0
+  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
  xboxOneDisableKinectGpuReservation: 0
  xboxOneEnable7thCore: 0
@@ -133,12 +131,24 @@ PlayerSettings:
    daydream:
      depthFormat: 0
      useSustainedPerformanceMode: 0
+      enableVideoLayer: 0
+      useProtectedVideoMemory: 0
+      minimumSupportedHeadTracking: 0
+      maximumSupportedHeadTracking: 1
    hololens:
      depthFormat: 1
+      depthBufferSharingEnabled: 0
+    enable360StereoCapture: 0
+    oculus:
+      sharedDepthBuffer: 0
+      dashSupport: 0
  protectGraphicsMemory: 0
  useHDRDisplay: 0
-  targetPixelDensity: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 30
  resolutionScalingMode: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
  applicationIdentifier:
    Android: com.Company.ProductName
    Standalone: unity.DefaultCompany.uDesktopDuplication
@@ -161,11 +171,9 @@ PlayerSettings:
  APKExpansionFiles: 0
  keepLoadedShadersAlive: 0
  StripUnusedMeshComponents: 0
-  VertexChannelCompressionMask:
-    serializedVersion: 2
-    m_Bits: 238
+  VertexChannelCompressionMask: 214
  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 7.0
+  iOSTargetOSVersionString: 8.0
  tvOSSdkVersion: 0
  tvOSRequireExtendedGameController: 0
  tvOSTargetOSVersionString: 9.0
@@ -181,15 +189,22 @@ PlayerSettings:
  iPhone47inSplashScreen: {fileID: 0}
  iPhone55inPortraitSplashScreen: {fileID: 0}
  iPhone55inLandscapeSplashScreen: {fileID: 0}
+  iPhone58inPortraitSplashScreen: {fileID: 0}
+  iPhone58inLandscapeSplashScreen: {fileID: 0}
  iPadPortraitSplashScreen: {fileID: 0}
  iPadHighResPortraitSplashScreen: {fileID: 0}
  iPadLandscapeSplashScreen: {fileID: 0}
  iPadHighResLandscapeSplashScreen: {fileID: 0}
  appleTVSplashScreen: {fileID: 0}
+  appleTVSplashScreen2x: {fileID: 0}
  tvOSSmallIconLayers: []
+  tvOSSmallIconLayers2x: []
  tvOSLargeIconLayers: []
+  tvOSLargeIconLayers2x: []
  tvOSTopShelfImageLayers: []
+  tvOSTopShelfImageLayers2x: []
  tvOSTopShelfImageWideLayers: []
+  tvOSTopShelfImageWideLayers2x: []
  iOSLaunchScreenType: 0
  iOSLaunchScreenPortrait: {fileID: 0}
  iOSLaunchScreenLandscape: {fileID: 0}
@@ -207,6 +222,8 @@ PlayerSettings:
  iOSLaunchScreeniPadFillPct: 100
  iOSLaunchScreeniPadSize: 100
  iOSLaunchScreeniPadCustomXibPath: 
+  iOSUseLaunchScreenStoryboard: 0
+  iOSLaunchScreenCustomStoryboardPath: 
  iOSDeviceRequirements: []
  iOSURLSchemes: []
  iOSBackgroundModes: 0
@@ -217,15 +234,24 @@ PlayerSettings:
  appleDeveloperTeamID: 
  iOSManualSigningProvisioningProfileID: 
  tvOSManualSigningProvisioningProfileID: 
+  iOSManualSigningProvisioningProfileType: 0
+  tvOSManualSigningProvisioningProfileType: 0
  appleEnableAutomaticSigning: 0
-  AndroidTargetDevice: 0
+  iOSRequireARKit: 0
+  appleEnableProMotion: 0
+  clonedFromGUID: 00000000000000000000000000000000
+  templatePackageId: 
+  templateDefaultScene: 
+  AndroidTargetArchitectures: 5
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
  AndroidKeystoreName: 
  AndroidKeyaliasName: 
  AndroidTVCompatibility: 1
  AndroidIsGame: 1
+  AndroidEnableTango: 0
  androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
  m_AndroidBanners:
  - width: 320
    height: 180
@@ -239,6 +265,8 @@ PlayerSettings:
      m_Icon: {fileID: 0}
      m_Width: 128
      m_Height: 128
+      m_Kind: 8357
+  m_BuildTargetPlatformIcons: []
  m_BuildTargetBatching: []
  m_BuildTargetGraphicsAPIs: []
  m_BuildTargetVRSettings:
@@ -296,29 +324,22 @@ PlayerSettings:
  - m_BuildTarget: tvOS
    m_Enabled: 0
    m_Devices: []
+  m_BuildTargetEnableVuforiaSettings: []
  openGLRequireES31: 0
  openGLRequireES31AEP: 0
-  webPlayerTemplate: APPLICATION:Default
  m_TemplateCustomTags: {}
-  wiiUTitleID: 0005000011000000
-  wiiUGroupID: 00010000
-  wiiUCommonSaveSize: 4096
-  wiiUAccountSaveSize: 2048
-  wiiUOlvAccessKey: 0
-  wiiUTinCode: 0
-  wiiUJoinGameId: 0
-  wiiUJoinGameModeMask: 0000000000000000
-  wiiUCommonBossSize: 0
-  wiiUAccountBossSize: 0
-  wiiUAddOnUniqueIDs: []
-  wiiUMainThreadStackSize: 3072
-  wiiULoaderThreadStackSize: 1024
-  wiiUSystemHeapSize: 128
-  wiiUTVStartupScreen: {fileID: 0}
-  wiiUGamePadStartupScreen: {fileID: 0}
-  wiiUDrcBufferDisabled: 0
-  wiiUProfilerLibPath: 
+  mobileMTRendering:
+    iPhone: 1
+    tvOS: 1
+  m_BuildTargetGroupLightmapEncodingQuality:
+  - m_BuildTarget: Standalone
+    m_EncodingQuality: 1
+  - m_BuildTarget: XboxOne
+    m_EncodingQuality: 1
+  - m_BuildTarget: PS4
+    m_EncodingQuality: 1
  playModeTestRunnerEnabled: 0
+  runPlayModeTestAsEditModeTest: 0
  actionOnDotNetUnhandledException: 1
  enableInternalProfiler: 0
  logObjCUncaughtExceptions: 1
@@ -409,7 +430,7 @@ PlayerSettings:
  switchApplicationErrorCodeCategory: 
  switchUserAccountSaveDataSize: 0
  switchUserAccountSaveDataJournalSize: 0
-  switchAttribute: 0
+  switchApplicationAttribute: 0
  switchCardSpecSize: 4
  switchCardSpecClock: 25
  switchRatingsMask: 0
@@ -435,8 +456,22 @@ PlayerSettings:
  switchLocalCommunicationIds_7: 
  switchParentalControl: 0
  switchAllowsScreenshot: 1
+  switchAllowsVideoCapturing: 1
+  switchAllowsRuntimeAddOnContentInstall: 0
  switchDataLossConfirmation: 0
  switchSupportedNpadStyles: 3
+  switchNativeFsCacheSize: 32
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchPlayerConnectionEnabled: 1
  ps4NPAgeRating: 12
  ps4NPTitleSecret: 
  ps4NPTrophyPackPath: 
@@ -455,6 +490,8 @@ PlayerSettings:
  ps4PronunciationSIGPath: 
  ps4BackgroundImagePath: 
  ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
  ps4SaveDataImagePath: 
  ps4SdkOverride: 
  ps4BGMPath: 
@@ -479,6 +516,7 @@ PlayerSettings:
  ps4pnFriends: 1
  ps4pnGameCustomData: 1
  playerPrefsSupport: 0
+  enableApplicationExit: 0
  restrictedAudioUsageRights: 0
  ps4UseResolutionFallback: 0
  ps4ReprojectionSupport: 0
@@ -549,7 +587,6 @@ PlayerSettings:
  psp2InfoBarOnStartup: 0
  psp2InfoBarColor: 0
  psp2ScriptOptimizationLevel: 0
-  psmSplashimage: {fileID: 0}
  splashScreenBackgroundSourceLandscape: {fileID: 0}
  splashScreenBackgroundSourcePortrait: {fileID: 0}
  spritePackerPolicy: 
@@ -563,14 +600,16 @@ PlayerSettings:
  webGLTemplate: APPLICATION:Default
  webGLAnalyzeBuildSize: 0
  webGLUseEmbeddedResources: 0
-  webGLUseWasm: 0
  webGLCompressionFormat: 1
+  webGLLinkerTarget: 0
  scriptingDefineSymbols: {}
  platformArchitecture: {}
  scriptingBackend:
    Standalone: 0
    WebPlayer: 0
+  il2cppCompilerConfiguration: {}
  incrementalIl2cppBuild: {}
+  allowUnsafeCode: 0
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 0
  apiCompatibilityLevelPerPlatform: {}
@@ -621,12 +660,6 @@ PlayerSettings:
  n3dsTitle: GameName
  n3dsProductCode: 
  n3dsApplicationId: 0xFF3FF
-  stvDeviceAddress: 
-  stvProductDescription: 
-  stvProductAuthor: 
-  stvProductAuthorEmail: 
-  stvProductLink: 
-  stvProductCategory: 0
  XboxOneProductId: 
  XboxOneUpdateKey: 
  XboxOneSandboxId: 
@@ -649,6 +682,7 @@ PlayerSettings:
  XboxOneSplashScreen: {fileID: 0}
  XboxOneAllowedProductIds: []
  XboxOnePersistentLocalStorageSize: 0
+  XboxOneXTitleMemory: 8
  xboxOneScriptCompiler: 0
  vrEditorSettings:
    daydream:
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0b5
+m_EditorVersion: 2018.1.9f1
Author	SHA1	Message	Date
hecomi	70cfad90a9	fix bug that caused darker screen #22 .	2018-08-05 00:20:03 +09:00
hecomi	c926127e49	update Unity version to 2018.1.	2018-08-05 00:19:07 +09:00
hecomi	03469ce429	remove unnecessary line break.	2018-08-05 00:18:42 +09:00
hecomi	f63e573f04	remove unnecessary logs.	2018-05-20 15:53:30 +09:00
hecomi	682553a5a2	tweak code.	2018-05-20 02:08:18 +09:00
hecomi	b5fd483d6a	call ReleaseFrame() just before AcquireNextFrame() #18 .	2018-05-20 01:11:03 +09:00
hecomi	0d2c0e02f0	update Visual Studio version to 2017.	2018-05-20 00:53:36 +09:00
hecomi	6f876f65ed	update Unity version to 2017.4.	2018-05-19 21:49:24 +09:00