Merge pull request #2985 from keveleigh/QRCodeNonWSABuild

David Kline · web-flow · commit b9abf1e0c11f · 2018-11-07T13:33:24.000-08:00
Added #if blocks to QR code preview feature
diff --git a/Assets/HoloToolkit-Preview/QRTracker/Scripts/AttachToQRCode.cs b/Assets/HoloToolkit-Preview/QRTracker/Scripts/AttachToQRCode.cs
@@ -1,10 +1,8 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using QRCodesTrackerPlugin;
 
 namespace HoloToolkit.Unity.QRTracking
 {
@@ -18,6 +16,7 @@ public class AttachToQRCode : MonoBehaviour
         private bool updatedId = false;
 
         private SpatialGraphCoordinateSystem coordSystem = null;
+
         /// <summary>
         /// Data of the QR code to which we want to attach the game object."
         /// </summary>
@@ -39,9 +38,11 @@ public string QRCodeData
                     {
                         qRCodeData = string.Empty;
                     }
-                    
+
+#if UNITY_EDITOR || UNITY_WSA
                     qrCodeId = QRCodesManager.Instance.GetIdForQRCode(qRCodeData);
                     updatedId = true;
+#endif // UNITY_EDITOR || UNITY_WSA
                 }
             }
         }
@@ -50,9 +51,11 @@ public string QRCodeData
 
         private void Awake()
         {
+#if UNITY_EDITOR || UNITY_WSA
             QRCodesManager.Instance.QRCodeAdded += Instance_QRCodeAdded;
             QRCodesManager.Instance.QRCodeUpdated += Instance_QRCodeUpdated;
             QRCodesManager.Instance.QRCodeRemoved += Instance_QRCodeRemoved;
+#endif // UNITY_EDITOR || UNITY_WSA
         }
 
         private void Start()
@@ -62,10 +65,14 @@ private void Start()
                 // default use the scripts object
                 gameObjectToAttach = gameObject;
             }
+
+#if UNITY_EDITOR || UNITY_WSA
             qrCodeId = QRCodesManager.Instance.GetIdForQRCode(qRCodeData);
             updatedId = true;
+#endif // UNITY_EDITOR || UNITY_WSA
         }
 
+#if UNITY_EDITOR || UNITY_WSA
         private void Instance_QRCodeAdded(object sender, QRCodeEventArgs<QRCodesTrackerPlugin.QRCode> e)
         {
             if (qrCodeId == System.Guid.Empty)
@@ -115,5 +122,6 @@ private void Update()
                 updatedId = false;
             }
         }
+#endif // UNITY_EDITOR || UNITY_WSA
     }
 }
diff --git a/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCode.cs b/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCode.cs
@@ -1,22 +1,16 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
-#if WINDOWS_UWP
-using Windows.Perception.Spatial;
-#endif
-
 namespace HoloToolkit.Unity.QRTracking
 {
-    [RequireComponent(typeof(HoloToolkit.Unity.SpatialGraphCoordinateSystem))]
+    [RequireComponent(typeof(SpatialGraphCoordinateSystem))]
     public class QRCode : MonoBehaviour
     {
+#if UNITY_EDITOR || UNITY_WSA
         public QRCodesTrackerPlugin.QRCode qrCode;
-        private GameObject qrCodeCube;
-
+#endif // UNITY_EDITOR || UNITY_WSA
         public float PhysicalSize;
         public string CodeText { get; set; }
 
@@ -26,13 +20,16 @@ public class QRCode : MonoBehaviour
         private TextMesh QRTimeStamp;
         private TextMesh QRSize;
         private GameObject QRInfo;
+        private GameObject qrCodeCube;
 
         private long lastTimeStamp = 0;
 
         private void Start()
         {
             PhysicalSize = 0.1f;
             CodeText = "Dummy";
+
+#if UNITY_EDITOR || UNITY_WSA
             if (qrCode == null)
             {
                 throw new System.Exception("QR Code Empty");
@@ -55,7 +52,15 @@ private void Start()
             QRSize.text = "Size:" + qrCode.PhysicalSizeMeters.ToString("F04") + "m";
             QRTimeStamp.text = "Time:" + qrCode.LastDetectedQPCTicks;
             Debug.Log("Id= " + qrCode.Id + " PhysicalSize = " + PhysicalSize + " TimeStamp = " + qrCode.LastDetectedQPCTicks + " QRVersion = " + qrCode.Version + " QRData = " + CodeText);
+#endif // UNITY_EDITOR || UNITY_WSA
+        }
+
+        private void Update()
+        {
+#if UNITY_EDITOR || UNITY_WSA
+            UpdatePropertiesDisplay();
         }
+
         private void UpdatePropertiesDisplay()
         {
             // Update properties that change
@@ -79,11 +84,7 @@ private void UpdatePropertiesDisplay()
                 lastTimeStamp = qrCode.LastDetectedQPCTicks;
                 QRInfo.transform.localScale = new Vector3(PhysicalSize/0.2f, PhysicalSize / 0.2f, PhysicalSize / 0.2f);
             }
-        }
-
-        private void Update()
-        {
-            UpdatePropertiesDisplay();
+#endif // UNITY_EDITOR || UNITY_WSA
         }
     }
 }
diff --git a/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCodesManager.cs b/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCodesManager.cs
@@ -2,13 +2,13 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System;
-using System.Collections;
-
 using System.Collections.Generic;
-
 using UnityEngine;
 
+#if UNITY_EDITOR || UNITY_WSA
 using QRCodesTrackerPlugin;
+#endif // UNITY_EDITOR || UNITY_WSA
+
 namespace HoloToolkit.Unity.QRTracking
 {
     public static class QRCodeEventArgs
@@ -36,18 +36,19 @@ public class QRCodesManager : Singleton<QRCodesManager>
         public bool AutoStartQRTracking = true;
 
         public bool IsTrackerRunning { get; private set; }
-        public QRCodesTrackerPlugin.QRTrackerStartResult StartResult { get; private set; }
 
+#if UNITY_EDITOR || UNITY_WSA
+        public QRTrackerStartResult StartResult { get; private set; }
 
         public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeAdded;
         public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeUpdated;
         public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeRemoved;
 
-        private System.Collections.Generic.SortedDictionary<System.Guid, QRCodesTrackerPlugin.QRCode> qrCodesList = new SortedDictionary<System.Guid, QRCodesTrackerPlugin.QRCode>();
+        private SortedDictionary<Guid, QRCodesTrackerPlugin.QRCode> qrCodesList = new SortedDictionary<Guid, QRCodesTrackerPlugin.QRCode>();
 
         private QRTracker qrTracker;
 
-        public System.Guid GetIdForQRCode(string qrCodeData)
+        public Guid GetIdForQRCode(string qrCodeData)
         {
             lock (qrCodesList)
             {
@@ -59,16 +60,17 @@ public System.Guid GetIdForQRCode(string qrCodeData)
                     }
                 }
             }
-            return System.Guid.Empty;
+            return Guid.Empty;
         }
 
-        public System.Collections.Generic.IList<QRCodesTrackerPlugin.QRCode> GetList()
+        public IList<QRCodesTrackerPlugin.QRCode> GetList()
         {
             lock (qrCodesList)
             {
                 return new List<QRCodesTrackerPlugin.QRCode>(qrCodesList.Values);
             }
         }
+#endif // UNITY_EDITOR || UNITY_WSA
 
         protected override void Awake()
         {
@@ -78,6 +80,7 @@ protected override void Awake()
 
         protected virtual void Start()
         {
+#if UNITY_EDITOR || UNITY_WSA
             qrTracker = new QRTracker();
             qrTracker.Added += QrTracker_Added;
             qrTracker.Updated += QrTracker_Updated;
@@ -87,8 +90,10 @@ protected virtual void Start()
             {
                 StartQRTracking();
             }
+#endif // UNITY_EDITOR || UNITY_WSA
         }
 
+#if UNITY_EDITOR || UNITY_WSA
         public QRTrackerStartResult StartQRTracking()
         {
             if (!IsTrackerRunning)
@@ -150,7 +155,6 @@ private void QrTracker_Added(QRCodeAddedEventArgs args)
                 handlers(this, QRCodeEventArgs.Create(args.Code));
             }
         }
-
+#endif // UNITY_EDITOR || UNITY_WSA
     }
-
 }
diff --git a/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCodesVisualizer.cs b/Assets/HoloToolkit-Preview/QRTracker/Scripts/QRCodesVisualizer.cs
@@ -1,22 +1,19 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
-
 using System.Collections.Generic;
-
 using UnityEngine;
 
-using QRCodesTrackerPlugin;
 namespace HoloToolkit.Unity.QRTracking
 {
     public class QRCodesVisualizer : MonoBehaviour
     {
         public GameObject qrCodePrefab;
 
         private SortedDictionary<System.Guid, GameObject> qrCodesObjectsList;
-
-        struct ActionData
+        
+#if UNITY_EDITOR || UNITY_WSA
+        private struct ActionData
         {
             public enum Type
             {
@@ -35,12 +32,16 @@ public ActionData(Type type, QRCodesTrackerPlugin.QRCode qRCode) : this()
         }
 
         private Queue<ActionData> pendingActions = new Queue<ActionData>();
+#endif // UNITY_EDITOR || UNITY_WSA
+
         private void Awake()
         {
+#if UNITY_EDITOR || UNITY_WSA
             qrCodesObjectsList = new SortedDictionary<System.Guid, GameObject>();
             QRCodesManager.Instance.QRCodeAdded += Instance_QRCodeAdded;
             QRCodesManager.Instance.QRCodeUpdated += Instance_QRCodeUpdated;
             QRCodesManager.Instance.QRCodeRemoved += Instance_QRCodeRemoved;
+#endif // UNITY_EDITOR || UNITY_WSA
         }
 
         private void Start()
@@ -51,6 +52,12 @@ private void Start()
             }
         }
 
+#if UNITY_EDITOR || UNITY_WSA
+        private void Update()
+        {
+            HandleEvents();
+        }
+
         private void Instance_QRCodeAdded(object sender, QRCodeEventArgs<QRCodesTrackerPlugin.QRCode> e)
         {
             lock (pendingActions)
@@ -105,11 +112,6 @@ private void HandleEvents()
                 }
             }
         }
-
-        private void Update()
-        {
-            HandleEvents();
-        }
+#endif // UNITY_EDITOR || UNITY_WSA
     }
-
 }
diff --git a/Assets/HoloToolkit-Preview/QRTracker/Scripts/SpatialGraphCoordinateSystem.cs b/Assets/HoloToolkit-Preview/QRTracker/Scripts/SpatialGraphCoordinateSystem.cs

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-using System.Collections;`
`5`	`4`	`using System.Collections.Generic;`
`6`	`5`	`using UnityEngine;`
`7`		`-using QRCodesTrackerPlugin;`
`8`	`6`
`9`	`7`	`namespace HoloToolkit.Unity.QRTracking`
`10`	`8`	`{`
`@@ -18,6 +16,7 @@ public class AttachToQRCode : MonoBehaviour`
`18`	`16`	`private bool updatedId = false;`
`19`	`17`
`20`	`18`	`private SpatialGraphCoordinateSystem coordSystem = null;`
	`19`	`+`
`21`	`20`	`/// <summary>`
`22`	`21`	`/// Data of the QR code to which we want to attach the game object."`
`23`	`22`	`/// </summary>`
`@@ -39,9 +38,11 @@ public string QRCodeData`
`39`	`38`	`{`
`40`	`39`	`qRCodeData = string.Empty;`
`41`	`40`	`}`
`42`		`-`
	`41`	`+`
	`42`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`43`	`43`	`qrCodeId = QRCodesManager.Instance.GetIdForQRCode(qRCodeData);`
`44`	`44`	`updatedId = true;`
	`45`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`
`@@ -50,9 +51,11 @@ public string QRCodeData`
`50`	`51`
`51`	`52`	`private void Awake()`
`52`	`53`	`{`
	`54`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`53`	`55`	`QRCodesManager.Instance.QRCodeAdded += Instance_QRCodeAdded;`
`54`	`56`	`QRCodesManager.Instance.QRCodeUpdated += Instance_QRCodeUpdated;`
`55`	`57`	`QRCodesManager.Instance.QRCodeRemoved += Instance_QRCodeRemoved;`
	`58`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`private void Start()`
`@@ -62,10 +65,14 @@ private void Start()`
`62`	`65`	`// default use the scripts object`
`63`	`66`	`gameObjectToAttach = gameObject;`
`64`	`67`	`}`
	`68`	`+`
	`69`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`65`	`70`	`qrCodeId = QRCodesManager.Instance.GetIdForQRCode(qRCodeData);`
`66`	`71`	`updatedId = true;`
	`72`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`67`	`73`	`}`
`68`	`74`
	`75`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`69`	`76`	`private void Instance_QRCodeAdded(object sender, QRCodeEventArgs<QRCodesTrackerPlugin.QRCode> e)`
`70`	`77`	`{`
`71`	`78`	`if (qrCodeId == System.Guid.Empty)`
`@@ -115,5 +122,6 @@ private void Update()`
`115`	`122`	`updatedId = false;`
`116`	`123`	`}`
`117`	`124`	`}`
	`125`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`118`	`126`	`}`
`119`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using System.Collections;`
`6`		`-`
`7`	`5`	`using System.Collections.Generic;`
`8`		`-`
`9`	`6`	`using UnityEngine;`
`10`	`7`
	`8`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`11`	`9`	`using QRCodesTrackerPlugin;`
	`10`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
	`11`	`+`
`12`	`12`	`namespace HoloToolkit.Unity.QRTracking`
`13`	`13`	`{`
`14`	`14`	`public static class QRCodeEventArgs`
`@@ -36,18 +36,19 @@ public class QRCodesManager : Singleton<QRCodesManager>`
`36`	`36`	`public bool AutoStartQRTracking = true;`
`37`	`37`
`38`	`38`	`public bool IsTrackerRunning { get; private set; }`
`39`		`- public QRCodesTrackerPlugin.QRTrackerStartResult StartResult { get; private set; }`
`40`	`39`
	`40`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
	`41`	`+ public QRTrackerStartResult StartResult { get; private set; }`
`41`	`42`
`42`	`43`	`public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeAdded;`
`43`	`44`	`public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeUpdated;`
`44`	`45`	`public event EventHandler<QRCodeEventArgs<QRCodesTrackerPlugin.QRCode>> QRCodeRemoved;`
`45`	`46`
`46`		`- private System.Collections.Generic.SortedDictionary<System.Guid, QRCodesTrackerPlugin.QRCode> qrCodesList = new SortedDictionary<System.Guid, QRCodesTrackerPlugin.QRCode>();`
	`47`	`+ private SortedDictionary<Guid, QRCodesTrackerPlugin.QRCode> qrCodesList = new SortedDictionary<Guid, QRCodesTrackerPlugin.QRCode>();`
`47`	`48`
`48`	`49`	`private QRTracker qrTracker;`
`49`	`50`
`50`		`- public System.Guid GetIdForQRCode(string qrCodeData)`
	`51`	`+ public Guid GetIdForQRCode(string qrCodeData)`
`51`	`52`	`{`
`52`	`53`	`lock (qrCodesList)`
`53`	`54`	`{`
`@@ -59,16 +60,17 @@ public System.Guid GetIdForQRCode(string qrCodeData)`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`}`
`62`		`- return System.Guid.Empty;`
	`63`	`+ return Guid.Empty;`
`63`	`64`	`}`
`64`	`65`
`65`		`- public System.Collections.Generic.IList<QRCodesTrackerPlugin.QRCode> GetList()`
	`66`	`+ public IList<QRCodesTrackerPlugin.QRCode> GetList()`
`66`	`67`	`{`
`67`	`68`	`lock (qrCodesList)`
`68`	`69`	`{`
`69`	`70`	`return new List<QRCodesTrackerPlugin.QRCode>(qrCodesList.Values);`
`70`	`71`	`}`
`71`	`72`	`}`
	`73`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`72`	`74`
`73`	`75`	`protected override void Awake()`
`74`	`76`	`{`
`@@ -78,6 +80,7 @@ protected override void Awake()`
`78`	`80`
`79`	`81`	`protected virtual void Start()`
`80`	`82`	`{`
	`83`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`81`	`84`	`qrTracker = new QRTracker();`
`82`	`85`	`qrTracker.Added += QrTracker_Added;`
`83`	`86`	`qrTracker.Updated += QrTracker_Updated;`
`@@ -87,8 +90,10 @@ protected virtual void Start()`
`87`	`90`	`{`
`88`	`91`	`StartQRTracking();`
`89`	`92`	`}`
	`93`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`90`	`94`	`}`
`91`	`95`
	`96`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`92`	`97`	`public QRTrackerStartResult StartQRTracking()`
`93`	`98`	`{`
`94`	`99`	`if (!IsTrackerRunning)`
`@@ -150,7 +155,6 @@ private void QrTracker_Added(QRCodeAddedEventArgs args)`
`150`	`155`	`handlers(this, QRCodeEventArgs.Create(args.Code));`
`151`	`156`	`}`
`152`	`157`	`}`
`153`		`-`
	`158`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`154`	`159`	`}`
`155`		`-`
`156`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,19 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-using System.Collections;`
`5`		`-`
`6`	`4`	`using System.Collections.Generic;`
`7`		`-`
`8`	`5`	`using UnityEngine;`
`9`	`6`
`10`		`-using QRCodesTrackerPlugin;`
`11`	`7`	`namespace HoloToolkit.Unity.QRTracking`
`12`	`8`	`{`
`13`	`9`	`public class QRCodesVisualizer : MonoBehaviour`
`14`	`10`	`{`
`15`	`11`	`public GameObject qrCodePrefab;`
`16`	`12`
`17`	`13`	`private SortedDictionary<System.Guid, GameObject> qrCodesObjectsList;`
`18`		`-`
`19`		`- struct ActionData`
	`14`	`+`
	`15`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
	`16`	`+ private struct ActionData`
`20`	`17`	`{`
`21`	`18`	`public enum Type`
`22`	`19`	`{`
`@@ -35,12 +32,16 @@ public ActionData(Type type, QRCodesTrackerPlugin.QRCode qRCode) : this()`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`private Queue<ActionData> pendingActions = new Queue<ActionData>();`
	`35`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
	`36`	`+`
`38`	`37`	`private void Awake()`
`39`	`38`	`{`
	`39`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
`40`	`40`	`qrCodesObjectsList = new SortedDictionary<System.Guid, GameObject>();`
`41`	`41`	`QRCodesManager.Instance.QRCodeAdded += Instance_QRCodeAdded;`
`42`	`42`	`QRCodesManager.Instance.QRCodeUpdated += Instance_QRCodeUpdated;`
`43`	`43`	`QRCodesManager.Instance.QRCodeRemoved += Instance_QRCodeRemoved;`
	`44`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`private void Start()`
`@@ -51,6 +52,12 @@ private void Start()`
`51`	`52`	`}`
`52`	`53`	`}`
`53`	`54`
	`55`	`+#if UNITY_EDITOR \|\| UNITY_WSA`
	`56`	`+ private void Update()`
	`57`	`+ {`
	`58`	`+ HandleEvents();`
	`59`	`+ }`
	`60`	`+`
`54`	`61`	`private void Instance_QRCodeAdded(object sender, QRCodeEventArgs<QRCodesTrackerPlugin.QRCode> e)`
`55`	`62`	`{`
`56`	`63`	`lock (pendingActions)`
`@@ -105,11 +112,6 @@ private void HandleEvents()`
`105`	`112`	`}`
`106`	`113`	`}`
`107`	`114`	`}`
`108`		`-`
`109`		`- private void Update()`
`110`		`- {`
`111`		`- HandleEvents();`
`112`		`- }`
	`115`	`+#endif // UNITY_EDITOR \|\| UNITY_WSA`
`113`	`116`	`}`
`114`		`-`
`115`	`117`	`}`