From 6f784860e539d943ef2f2bc62f56f0e36e5e1282 Mon Sep 17 00:00:00 2001 From: hecomi Date: Fri, 4 Nov 2016 22:58:19 +0900 Subject: [PATCH] make shaders simpler. --- .../Examples/Prefabs/Monitor.prefab | Bin 8508 -> 8508 bytes .../Examples/Scenes/Multiple Monitors.unity | Bin 14072 -> 14032 bytes .../Primary Monitor (Only Texture).unity | Bin 17040 -> 0 bytes .../Primary Monitor (Only Texture).unity.meta | 8 -------- ...(+ Cursor).unity => Primary Monitor.unity} | Bin ....unity.meta => Primary Monitor.unity.meta} | 0 Assets/uDesktopDuplication/Scripts/Cursor.cs | 3 +-- Assets/uDesktopDuplication/Scripts/Texture.cs | 8 ++++++++ 8 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity delete mode 100644 Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity.meta rename Assets/uDesktopDuplication/Examples/Scenes/{Primary Monitor (+ Cursor).unity => Primary Monitor.unity} (100%) rename Assets/uDesktopDuplication/Examples/Scenes/{Primary Monitor (+ Cursor).unity.meta => Primary Monitor.unity.meta} (100%) diff --git a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor.prefab b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor.prefab index 7bd2daad66f43fe2e4a62a112c49ee58860ac7c8..6fad93bd415d64ad76a2b3a65aa051594a89161b 100644 GIT binary patch delta 27 ecmdnvw8v>fg)GaN&n9y>*T|+YLRe4aBA5WN7z`=^ delta 27 ecmdnvw8v>fg)EDh?1je7HL@v;5Y`j92qplNtO^nU diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity index d4729597cef25947bd461d02225d92b45ce3aa36..ffccd0eccb11f91c5a918da8aac88b15cf29ebd2 100644 GIT binary patch delta 150 zcmey7dm&eVfkFQ(1B2NG1_lOx1_lFxi2|CUM>tL|t8f#3(YarA<+s0EPRjx%LpS>E zW}2+X?7>r>nNpI$kegVPo|(6~n%Pln^DbQ{M#hNAfAz#=cd#%p6abY2DIos;A4o9- wde2D*(HfHt^`#kCO!ftm0h2TJuWoiSSir)@V1M?^8QaN<1`3-6OkXep04t*|)Bpeg delta 195 zcmcbR`y*F?fx$qKfx+wt0|Ns;kZmwgKvVRa%G`R{H$AUra9{hqos zyg=81kuhfSLp^cE1CxL1Ny{3rGBDHvwK9V7|NkIkg1qOXgXj&D4fUlNBPRRmU!DBG lfMv6i!2%X81;?{z&e)1?544;-(NJab1QU+UA50!F0s#FZIZOZm diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity deleted file mode 100644 index f8c4571661c0a8c11147905edb5c370ded7f6896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17040 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 Cl_Jal diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity.meta b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity.meta deleted file mode 100644 index 6bd05ed..0000000 --- a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (Only Texture).unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 281e2991d4d33984fa180845e56cd3f3 -timeCreated: 1477648643 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (+ Cursor).unity b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity similarity index 100% rename from Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (+ Cursor).unity rename to Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (+ Cursor).unity.meta b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity.meta similarity index 100% rename from Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor (+ Cursor).unity.meta rename to Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity.meta diff --git a/Assets/uDesktopDuplication/Scripts/Cursor.cs b/Assets/uDesktopDuplication/Scripts/Cursor.cs index 820c32f..085fe94 100644 --- a/Assets/uDesktopDuplication/Scripts/Cursor.cs +++ b/Assets/uDesktopDuplication/Scripts/Cursor.cs @@ -8,8 +8,6 @@ namespace uDesktopDuplication RequireComponent(typeof(Texture))] public class Cursor : MonoBehaviour { - [SerializeField] Vector2 modelScale = Vector2.one; - Vector3 worldPosition { get; set; } private Texture uddTexture_; @@ -17,6 +15,7 @@ public class Cursor : MonoBehaviour private Texture2D currentTexture_; private Dictionary textures_ = new Dictionary(); + [SerializeField] Vector2 modelScale = Vector2.one; void Start() { diff --git a/Assets/uDesktopDuplication/Scripts/Texture.cs b/Assets/uDesktopDuplication/Scripts/Texture.cs index d914d13..e1ba444 100644 --- a/Assets/uDesktopDuplication/Scripts/Texture.cs +++ b/Assets/uDesktopDuplication/Scripts/Texture.cs @@ -33,6 +33,14 @@ public class Texture : MonoBehaviour private set; } + void Awake() + { + if (!GetComponent()) + { + gameObject.AddComponent(); + } + } + void OnEnable() { if (monitor == null) {