updated uNet example scripts.

Author: Stephen Hodgson

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/GenericNetworkTransmitter.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
 using UnityEngine;
 using HoloToolkit.Unity;
 
@@ -20,7 +21,6 @@ namespace HoloToolkit.Examples.SharingWithUNET
     /// </summary>
     public class GenericNetworkTransmitter : Singleton<GenericNetworkTransmitter>
     {
-
         [Tooltip("The connection port on the machine to use.")]
         public int SendConnectionPort = 11000;
 
@@ -29,12 +29,12 @@ public class GenericNetworkTransmitter : Singleton<GenericNetworkTransmitter>
         /// </summary>
         /// <param name="data">The data that arrived.</param>
         public delegate void OnDataReady(byte[] data);
-        public event OnDataReady dataReadyEvent;
+        public event OnDataReady DataReadyEvent;
 
         /// <summary>
         /// The server to connect to when data is needed.
         /// </summary>
-        private string serverIP;
+        private string serverIp = string.Empty;
 
         /// <summary>
         /// Tracks if we have a connection request outstanding.
@@ -58,10 +58,10 @@ public void SetData(byte[] data)
         /// <summary>
         /// Tells us who to contact if we need data.
         /// </summary>
-        /// <param name="ServerIP"></param>
-        public void SetServerIP(string ServerIP)
+        /// <param name="_serverIp"></param>
+        public void SetServerIp(string _serverIp)
         {
-            serverIP = ServerIP.Trim();
+            serverIp = _serverIp.Trim();
         }
 
         /// <summary>
@@ -193,12 +193,6 @@ private async void RcvNetworkConnectedHandler(IAsyncAction asyncInfo, AsyncStatu
             else
             {
                 Debug.Log("Failed to establish connection for rcv. Error Code: " + asyncInfo.ErrorCode);
-                // In the failure case we'll requeue the data and wait before trying again.
-
-
-                // And set the defer time so the update loop can do the 'Unity things' 
-                // on the main Unity thread.
-                Invoke("RequestAndGetAnchor", timeToDeferFailedConnections);
             }
 
             networkConnection.Dispose();
@@ -210,7 +204,7 @@ public void ConfigureAsServer()
     {
         Debug.Log("This script is not intended to be run from the Unity Editor");
         // In order to avoid compiler warnings in the Unity Editor we have to access a few of our fields.
-        Debug.Log(string.Format("serverIP = {0} waitingForConnection = {1} mostRecentDataBuffer = {2}", serverIP, waitingForConnection, mostRecentDataBuffer == null ? "No there" : "there"));
+        Debug.Log(string.Format("serverIP = {0} waitingForConnection = {1} mostRecentDataBuffer = {2}", serverIp, waitingForConnection, mostRecentDataBuffer == null ? "No there" : "there"));
     }
     private void ConnectListener() {}
 #endif

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/UNetAnchorManager.cs

@@ -7,7 +7,7 @@
 using HoloToolkit.Unity;
 using System;
 
-#if UNITY_EDITOR || UNITY_WSA
+#if UNITY_WSA
 using UnityEngine.VR.WSA.Sharing;
 using UnityEngine.VR.WSA;
 using UnityEngine.VR.WSA.Persistence;
@@ -152,7 +152,7 @@ private void Start()
                 return;
             }
 
-            networkTransmitter.dataReadyEvent += NetworkTransmitter_dataReadyEvent;
+            networkTransmitter.DataReadyEvent += NetworkTransmitter_dataReadyEvent;
         }
 
         /// <summary>
@@ -173,7 +173,7 @@ private void NetworkTransmitter_dataReadyEvent(byte[] data)
         /// </summary>
         public void CreateAnchor()
         {
-#if UNITY_EDITOR || UNITY_WSA
+#if UNITY_WSA
             objectToAnchor = SharedCollection.Instance.gameObject;
             WorldAnchorTransferBatch watb = new WorldAnchorTransferBatch();
             WorldAnchor worldAnchor = objectToAnchor.GetComponent<WorldAnchor>();
@@ -202,15 +202,15 @@ public void WaitForAnchor()
         /// Attempts to attach to  an anchor by anchorName in the local store..
         /// </summary>
         /// <returns>True if it attached, false if it could not attach</returns>
-        private bool AttachToCachedAnchor(string AnchorName)
+        private bool AttachToCachedAnchor(string anchorName)
         {
-#if UNITY_EDITOR || UNITY_WSA
+#if UNITY_WSA
             WorldAnchorStore anchorStore = WorldAnchorManager.Instance.AnchorStore;
-            Debug.Log("Looking for " + AnchorName);
+            Debug.Log("Looking for " + anchorName);
             string[] ids = anchorStore.GetAllIds();
             for (int index = 0; index < ids.Length; index++)
             {
-                if (ids[index] == AnchorName)
+                if (ids[index] == anchorName)
                 {
                     Debug.Log("Using what we have");
                     anchorStore.Load(ids[index], objectToAnchor);
@@ -232,7 +232,7 @@ private void WriteBuffer(byte[] data)
             exportingAnchorBytes.AddRange(data);
         }
 
-#if UNITY_EDITOR || UNITY_WSA
+#if UNITY_WSA
         private void Update()
         {
             if (gotOne)