From 60889d53f4bf8a5b3422e0bb6182d8673b9f4378 Mon Sep 17 00:00:00 2001 From: hecomi Date: Sat, 19 Nov 2016 13:49:38 +0900 Subject: [PATCH] modify layouter to fix height. --- .../Scenes/Multiple Monitors Roundly.unity | Bin 15312 -> 15312 bytes .../Scripts/MultipleMonitorCreator.cs | 4 ++-- .../Scripts/MultipleMonitorLayouter.cs | 4 ++-- .../Plugins/x86_64/uDesktopDuplication.dll | Bin 72192 -> 72192 bytes Assets/uDesktopDuplication/Scripts/Lib.cs | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity index edd604f670455d411d53d5a5bef9ddad66c849c7..901d1b4bcb5d5672234d56db8bdee4dd7ec7d535 100644 GIT binary patch delta 24 gcmcamexZDV1hY|^(MD-YOO{zPXWDI!u&iJL0D5l;4gdfE delta 24 fcmcamexZDV1hZk9;YMjoOBMzO2K&tsmK96@YxD;} diff --git a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs index b5d9b1c..bf95c21 100644 --- a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs +++ b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorCreator.cs @@ -125,8 +125,8 @@ public class MultipleMonitorCreator : MonoBehaviour height = monitor.heightMeter; break; case ScaleMode.Fixed: - width = scale * (monitor.isHorizontal ? 1f : monitor.aspect); - height = scale * (monitor.isHorizontal ? 1f / monitor.aspect : 1f); + width = scale * (monitor.isHorizontal ? monitor.aspect : 1f); + height = scale * (monitor.isHorizontal ? 1f : 1f / monitor.aspect); break; case ScaleMode.Pixel: width = scale * (monitor.isHorizontal ? 1f : monitor.aspect) * ((float)monitor.width / 1920); diff --git a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorLayouter.cs b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorLayouter.cs index 870edae..16b2d02 100644 --- a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorLayouter.cs +++ b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorLayouter.cs @@ -30,7 +30,7 @@ public class MultipleMonitorLayouter : MonoBehaviour var totalWidth = 0f; foreach (var info in monitors) { - var width = info.gameObject.transform.localEulerAngles.x * (info.mesh.bounds.extents.x * 2f); + var width = info.gameObject.transform.localScale.x * (info.mesh.bounds.extents.x * 2f); totalWidth += width; } totalWidth += margin * (n - 1); @@ -38,7 +38,7 @@ public class MultipleMonitorLayouter : MonoBehaviour var x = -totalWidth / 2; foreach (var info in monitors) { - var width = info.gameObject.transform.localEulerAngles.x; + var width = info.gameObject.transform.localScale.x; x += (width * info.mesh.bounds.extents.x); info.gameObject.transform.localPosition = new Vector3(x, 0f, 0f); info.gameObject.transform.localRotation = info.originalRotation; diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll index 497abdbfbcf25fa481ae30514bdf0c6ad4707a6f..9f4420d355c9a5a681235850d5f283be68ae3264 100644 GIT binary patch delta 734 zcmY+CPe>F|9LIle+et0A-D<^Hi?qZ)mppA`C2Ypp)1AdSNJWQ|txI%pw=qzo-DO=U zrU79Nb|@4tfdxe)b}7+1*m@`gYcG+8;Es4K!rSZnW;UULH}Cg;@ALc4m)~zPGv3UM z_jQ1IQbp?kn;u}l%=gLKw7$)aK0nuEhis#g$O%@ei1K2nKPxU%MMmq*3P!^ZwUb%V zB=;j((Tv?c`q)FXcs^L#MPx_t+8jZ`-av%xZbITV65Q~eQIY@rO^D5_lDO%`Rj<6t zwT!fof3#J`di*)pnQBDGxlt2}6Nx~6erS(flJqh2dg?5@Wj;;aO)tlw@%^h1+~|nD zB+7OCnZ(Dm2Cge%oOyzKbNAZ=H0Xzt&ZYJjyY8b9_UscObl)f7`GTf$y+(2PPVlF| z9|nK4%jLH|Nc0&{U_V|s6(OGJ^rl@_YG>d?YR`jJjqtf{BK48hSg#s!OEr`*&gkwd zJEBOJmv&r^LGFK-8y8%qdr-3XJ1&oxU8=fr1AKQP;<`*bHix5bL6>85djen9mG-jD z9oFf##R2J7e^%+EeH-CRRa`i`8Qa;^F{$@5AWkP;4hxgcx%MgtnPe z+CkQD&T5U;nif<~r;2S?P)V2}4PyOX#VW`Q(Z9QD#6he(YgkJN@T7|7iG`5-9eWn$ yDp{*lwKP%N@a6##!|gllQgOX}u1?DuqDiap^P1vG7OkezbTccyUEasq_WlL;_yBhR delta 690 zcmY*XO=uHA6n>NL8jY@rC8ZJqHc(nGnv2@{v#1qi+HS=jLIqnvgXE%E(=DPFvl0u+ zvIku#A_c1#Ar=(2pn?{wLP;;7f}Vsb3f&Y69y~}d<2T8QI`H2{00?hr+Y1bfZcFk z!1`)AX1Fu`7PZJ0biJ_k^&u z?^8tMWz*nxQ>w=A0>2adB>4M})%juYZS5tfpshWrok;L(m*SR2B85qKkgA{G3Sl_A zhq{T3+h%Kv;q-ZiqxPfcPUfjU2=hh#0#xe$rXlpdzfj=sE|mNoHGc;Ke}=7&f#01y z^pC%ZqfjW|>a#dtYjJSF%LE4ha^<^+1D74rWnk|c?0ND|C$r?w)@KriJ@ip-_ipvq zV7XQt28^PG+f1Ao#w;|9?0pYD{$+R4+{SY5E3?&2q+{NS88PUIDC diff --git a/Assets/uDesktopDuplication/Scripts/Lib.cs b/Assets/uDesktopDuplication/Scripts/Lib.cs index be5ed75..6f5fa53 100644 --- a/Assets/uDesktopDuplication/Scripts/Lib.cs +++ b/Assets/uDesktopDuplication/Scripts/Lib.cs @@ -14,6 +14,7 @@ public enum Message public enum CursorShapeType { + Unspecified = 0, MonoChrome = 1, Color = 2, MaskedColor = 4,