From 8e2d8d3218460cf4b36caa09f1988348590607ea Mon Sep 17 00:00:00 2001
From: hecomi <info@hecomi.com>
Date: Sun, 6 Nov 2016 21:16:35 +0900
Subject: [PATCH] fix cursor visibility bug.

---
 .../Scripts/MultipleMonitorCreator.cs         |   6 +++---
 .../Plugins/uDesktopDuplication.dll           | Bin 35328 -> 35328 bytes
 Assets/uDesktopDuplication/Scripts/Cursor.cs  |   7 ++++---
 .../uDesktopDuplication/Cursor.cpp            |   5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs
index e37a5f9..773f7a1 100644
--- a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs
+++ b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs
@@ -52,14 +52,14 @@ public class MultipleMonitorCreator : MonoBehaviour
             var monitor = texture.monitor;
 
             // Set width / height
-            go.transform.localScale = new Vector3(monitor.widthMeter, go.transform.localScale.y, monitor.heightMeter);
+            go.transform.localScale = new Vector3(monitor.widthMeter, go.transform.localScale.y, monitor.heightMeter) * scale;
 
             // Set parent as this object
             go.transform.SetParent(transform);
 
             // Calc actual size considering mesh size
             var scaleX = go.GetComponent<MeshFilter>().sharedMesh.bounds.extents.x * 2f;
-            totalWidth_ += monitor.widthMeter * scaleX;
+            totalWidth_ += monitor.widthMeter * scale * scaleX;
         }
     }
 
@@ -71,7 +71,7 @@ public class MultipleMonitorCreator : MonoBehaviour
         foreach (var go in monitors_) {
             var monitor = go.GetComponent<uDesktopDuplication.Texture>().monitor;
             var halfScaleX = go.GetComponent<MeshFilter>().sharedMesh.bounds.extents.x;
-            var width = monitor.widthMeter;
+            var width = monitor.widthMeter * scale;
             var halfWidth = width * halfScaleX;
             x += halfWidth;
             go.transform.localPosition = new Vector3(x, 0f, 0f);
diff --git a/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll
index 1fdb19f9db2aedba2b3f0de913e2f7c5e79bdec6..a0c48967a42ef8812acdf20ef295b0922115cecb 100644
GIT binary patch
delta 147
zcmZpe!qhN@X#pd%v$XtXX2$1c%KTFgbU1Q&bUSf)bUFq!SE(?R@OyMKb_0c2(}Eco
zIz0?F^IAMtvIgpiU;qLpAT9;sCpkbI2NGdmfXVRy*&;w3lMBT0AQ`aSWc_GKu#Mi)
UYnd6vH~);AEdb_E&(D+s0A`FK?f?J)

delta 147
zcmZpe!qhN@X#pei^m%fdnHis(DVHdEbTf8ycyzN?1T!#ndKh?gJ8^h)ItMgYsW9+Q
zJ<#FIv6<K6xso+dM+5^9FadEX5I@NQ;y9290|QKs2gnuy;+R|@jt9wr<tFP#OM-3m
Vj$X^mD7N`$+-w0be|mnV6aa(cCm8?$

diff --git a/Assets/uDesktopDuplication/Scripts/Cursor.cs b/Assets/uDesktopDuplication/Scripts/Cursor.cs
index 4e62b43..b362203 100644
--- a/Assets/uDesktopDuplication/Scripts/Cursor.cs
+++ b/Assets/uDesktopDuplication/Scripts/Cursor.cs
@@ -27,8 +27,8 @@ public class Cursor : MonoBehaviour
         if (monitor.isCursorVisible) {
             UpdatePosition();
             UpdateTexture();
-            UpdateMaterial();
         }
+        UpdateMaterial();
     }
 
     void UpdatePosition()
@@ -60,8 +60,9 @@ public class Cursor : MonoBehaviour
 
     void UpdateMaterial()
     {
-        var x = monitor.isCursorVisible ? (float)monitor.cursorX / monitor.width : -9999f;
-        var y = monitor.isCursorVisible ? (float)monitor.cursorY / monitor.height : -9999f;
+        bool isVisible = monitor.isCursorVisible;
+        var x = isVisible ? (float)monitor.cursorX / monitor.width : -9999f;
+        var y = isVisible ? (float)monitor.cursorY / monitor.height : -9999f;
         var w = (float)monitor.cursorShapeWidth  / monitor.width;
         var h = (float)monitor.cursorShapeHeight / monitor.height;
         uddTexture_.material.SetVector("_CursorPositionScale", new Vector4(x, y, w, h));
diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
index cc21615..d2f0035 100644
--- a/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
+++ b/Plugins/uDesktopDuplication/uDesktopDuplication/Cursor.cpp
@@ -35,10 +35,11 @@ void Cursor::UpdateBuffer(const DXGI_OUTDUPL_FRAME_INFO& frameInfo)
 
     x_ = frameInfo.PointerPosition.Position.x;
     y_ = frameInfo.PointerPosition.Position.y;
+    isVisible_ = frameInfo.PointerPosition.Visible != 0;
+    timestamp_ = frameInfo.LastMouseUpdateTime;
+
     if (frameInfo.PointerPosition.Visible != 0) {
         GetMonitorManager()->SetCursorMonitorId(monitor_->GetId());
-        timestamp_ = frameInfo.LastMouseUpdateTime;
-        isVisible_ = frameInfo.PointerPosition.Visible != 0;
     }
 
     if (frameInfo.PointerShapeBufferSize == 0)