From 212d8ccb9b9e67d6f5051cd9a05446e5e2b38e8e Mon Sep 17 00:00:00 2001 From: hecomi Date: Sat, 12 Nov 2016 15:22:53 +0900 Subject: [PATCH] check zoom values. --- .../Examples/Scenes/Zoom.unity | Bin 22880 -> 22880 bytes .../Examples/Scripts/Loupe.cs | 9 +++++++++ .../Plugins/x86_64/uDesktopDuplication.dll | Bin 55296 -> 55296 bytes Assets/uDesktopDuplication/Scripts/Manager.cs | 4 +++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity b/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity index 2a36f3f825ce43021237bfd2e314068b6d1bdce5..c92038c9d830f0024c3f0c24f4fb513c933faeda 100644 GIT binary patch delta 44 vcmaE`iSfZE#tn9%Tn+XNP%zmeRF28Sd2*t+$Yh6b*2$^f(wpam9$^LmEEo+% delta 34 qcmaE`iSfZE#tn9%liR{YCI^LzOiuR}o9qzIIyu!_dh?vnBg_E($PJGG diff --git a/Assets/uDesktopDuplication/Examples/Scripts/Loupe.cs b/Assets/uDesktopDuplication/Examples/Scripts/Loupe.cs index d9337c2..0c1cca7 100644 --- a/Assets/uDesktopDuplication/Examples/Scripts/Loupe.cs +++ b/Assets/uDesktopDuplication/Examples/Scripts/Loupe.cs @@ -14,6 +14,9 @@ public class Loupe : MonoBehaviour void Update() { + CheckVariables(); + + if (uDesktopDuplication.Manager.cursorMonitorId < 0) return; uddTexture_.monitorId = uDesktopDuplication.Manager.cursorMonitorId; // To get other monitor textures, set dirty flag. @@ -31,5 +34,11 @@ public class Loupe : MonoBehaviour uddTexture_.clipPos = new Vector2(x, y); uddTexture_.clipScale = new Vector2(w, h); } + + void CheckVariables() + { + if (zoom < 1f) zoom = 1f; + if (aspect < 0.01f) aspect = 0.01f; + } } diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll index 4075b3515f6c31252ffb45816dca03f8eee52a28..caaf1debeb9245bc3d29ca19308fe95ca0975ae6 100644 GIT binary patch delta 118 zcmZqJz}&Ebc>yES=8c<~7$yDnGxKI9#!1~)&dh2N3_!pH#HB!7vkHi(fJ7J=U~)V_wg?b^0m^-W v%S}GlBLy<%RnIhb!MAk}w4Tniblb7==zPWpZ-iMlPn_~u93 diff --git a/Assets/uDesktopDuplication/Scripts/Manager.cs b/Assets/uDesktopDuplication/Scripts/Manager.cs index 87c348a..3b42ded 100644 --- a/Assets/uDesktopDuplication/Scripts/Manager.cs +++ b/Assets/uDesktopDuplication/Scripts/Manager.cs @@ -118,7 +118,9 @@ public class Manager : MonoBehaviour Debug.Log("[uDesktopDuplication] Reinitialize"); Lib.Reinitialize(); CreateMonitors(); - onReinitialized(); + if (onReinitialized != null) { + onReinitialized(); + } } void ReinitializeIfNeeded()