Merge pull request #327 from HodgsonSDAS/master

Cross platform compatibility

Author: NeerajW

Assets/HoloToolkit/Sharing/Tests/ImportExportAnchorManager.cs

@@ -233,7 +233,7 @@ private void MarkSharingServiceReady()
     {
         sharingServiceReady = true;
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
         InitRoomApi();
 #endif
     }

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/FileSurfaceObserver.cs

@@ -70,7 +70,7 @@ public void Load(string fileName)
         private void Update()
         {
             // Keyboard commands for saving and loading a remotely generated mesh file.
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
             // S - saves the active mesh
             if (Input.GetKeyUp(KeyCode.S))
             {

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/MeshSaver.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using UnityEngine;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
 using System.Threading.Tasks;
 using Windows.Storage;
 #endif
@@ -30,7 +30,7 @@ public static string MeshFolderName
         {
             get
             {
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
                 return ApplicationData.Current.RoamingFolder.Path;
 #else
                 return Application.persistentDataPath;
@@ -117,7 +117,7 @@ private static Stream OpenFileForRead(string folderName, string fileName)
         {
             Stream stream = null;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
             Task<Task> task = Task<Task>.Factory.StartNew(
                             async () =>
                             {
@@ -144,7 +144,7 @@ private static Stream OpenFileForWrite(string folderName, string fileName)
         {
             Stream stream = null;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
             Task<Task> task = Task<Task>.Factory.StartNew(
                             async () =>
                             {

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/RemoteMappingManager.cs

@@ -46,7 +46,7 @@ private void Start()
             keywordRecognizer.OnPhraseRecognized += KeywordRecognizer_OnPhraseRecognized;
             keywordRecognizer.Start();
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
             remoteMeshTarget = GetComponent<RemoteMeshTarget>();
 
             if (remoteMeshTarget != null && SpatialMappingManager.Instance.Source == null)
@@ -60,7 +60,7 @@ private void Start()
         // Called every frame by the Unity engine.
         private void Update()
         {
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
             // Use the 'network' sourced mesh.  
             if (Input.GetKeyUp(RemoteMappingKey))
             {
@@ -88,7 +88,7 @@ private void KeywordRecognizer_OnPhraseRecognized(PhraseRecognizedEventArgs args
         /// </summary>
         private void SendMeshes()
         {
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
             List<MeshFilter> MeshFilters = SpatialMappingManager.Instance.GetMeshFilters();
             for (int index = 0; index < MeshFilters.Count; index++)
             {

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/RemoteMeshSource.cs

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections.Generic;
 using UnityEngine;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
+using System.Collections.Generic;
 using Windows.Networking.Sockets;
 using Windows.Storage.Streams;
 using Windows.Networking;
@@ -24,7 +24,7 @@ public class RemoteMeshSource : Singleton<RemoteMeshSource>
         [Tooltip("The connection port on the machine to use.")]
         public int ConnectionPort = 11000;
 
-#if !UNITY_EDITOR 
+#if !UNITY_EDITOR && UNITY_METRO
         /// <summary>
         /// Tracks the network connection to the remote machine we are sending meshes to.
         /// </summary>

Assets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/RemoteMeshTarget.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using UnityEngine;
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
 using System.Net;
 using System.Net.Sockets;
 #endif
@@ -26,7 +26,7 @@ public class RemoteMeshTarget : SpatialMappingSource
         [Tooltip("The connection port on the machine to use.")]
         public int ConnectionPort = 11000;
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
         /// <summary>
         /// Listens for network connections over TCP.
         /// </summary> 

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/RemoveSurfaceVertices.cs

@@ -40,7 +40,7 @@ public class RemoveSurfaceVertices : Singleton<RemoveSurfaceVertices>
         /// </summary>
         private Queue<Bounds> boundingObjectsQueue;
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
         /// <summary>
         /// How much time (in sec), while running in the Unity Editor, to allow RemoveSurfaceVertices to consume before returning control to the main program.
         /// </summary>

Assets/HoloToolkit/SpatialMapping/Scripts/SpatialProcessing/SurfaceMeshesToPlanes.cs

@@ -6,10 +6,12 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
 using System.Threading;
 using System.Threading.Tasks;
-#else
+#endif
+
+#if UNITY_EDITOR
 using UnityEditor;
 #endif
 
@@ -82,7 +84,7 @@ public class SurfaceMeshesToPlanes : Singleton<SurfaceMeshesToPlanes>
         /// </summary>
         private bool makingPlanes = false;
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR || UNITY_STANDALONE
         /// <summary>
         /// How much time (in sec), while running in the Unity Editor, to allow RemoveSurfaceVertices to consume before returning control to the main program.
         /// </summary>
@@ -186,7 +188,7 @@ private IEnumerator MakePlanesRoutine()
             // Pause our work, and continue on the next frame.
             yield return null;
 
-#if !UNITY_EDITOR
+#if !UNITY_EDITOR && UNITY_METRO
             // When not in the unity editor we can use a cool background task to help manage FindPlanes().
             Task<BoundedPlane[]> planeTask = Task.Run(() => PlaneFinding.FindPlanes(meshData, snapToGravityThreshold, MinArea));