Getting it a bit closer to the Sharing Stage Connection refactor...

StephenHodgson · StephenHodgson · commit b12fed53841f · 2017-07-13T15:42:14.000-07:00
diff --git a/Assets/HoloToolkit-Tests/Sharing/Scenes/SharingTest.unity b/Assets/HoloToolkit-Tests/Sharing/Scenes/SharingTest.unity
@@ -402,106 +402,6 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
   m_IsPrefabParent: 0
---- !u!1001 &731017293
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 320
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 320
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 9a2f56337670a294baaf9bba300b1c1c, type: 2}
-  m_IsPrefabParent: 0
 --- !u!102 &754146363 stripped
 TextMesh:
   m_PrefabParentObject: {fileID: 102277783203209222, guid: 16014d77e332f484388b5872987a2c02,
@@ -633,6 +533,106 @@ MonoBehaviour:
 Transform:
   m_PrefabParentObject: {fileID: 475158, guid: 8aaf37823b26ee449bb3b3d7775965c3, type: 2}
   m_PrefabInternal: {fileID: 1703234099}
+--- !u!1001 &1004402896
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 320
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 320
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224469518390730572, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 9a2f56337670a294baaf9bba300b1c1c, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &1703234099
 Prefab:
   m_ObjectHideFlags: 0
diff --git a/Assets/HoloToolkit/Sharing/Prefabs/ManualIpConfigUtility.prefab b/Assets/HoloToolkit/Sharing/Prefabs/ManualIpConfigUtility.prefab
@@ -1003,7 +1003,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1315177525143494}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1dc603e0d201da746b38b8ce2e4ae7a6, type: 3}
+  m_Script: {fileID: 11500000, guid: d529249adad35084bbde52a834d075cd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   HideWhenConnected: 1
@@ -1563,6 +1563,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   PivotAxis: 0
+  TargetTransform: {fileID: 0}
 --- !u!114 &114522924503171464
 MonoBehaviour:
   m_ObjectHideFlags: 1
diff --git a/Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs b/Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs
@@ -150,42 +150,25 @@ public string UserName
         }
 
         private NetworkConnectionAdapter networkConnectionAdapter;
-        private NetworkConnection networkConnection;
         public NetworkConnection Connection
         {
-            get
-            {
-                if (networkConnection == null && Manager != null)
-                {
-                    networkConnection = Manager.GetServerConnection();
-                }
-                return networkConnection;
-            }
+            get { return Manager != null ? Manager.GetServerConnection() : null; }
         }
 
         /// <summary>
         /// Returns true if connected to a Sharing Service server.
         /// </summary>
         public bool IsConnected
         {
-            get
-            {
-                if (Manager != null && Connection != null)
-                {
-                    return Connection.IsConnected();
-                }
-
-                return false;
-            }
+            get { return Manager != null && Connection != null && Connection.IsConnected(); }
         }
 
         protected override void Awake()
         {
             base.Awake();
 
             AppInstanceUniqueId = Guid.NewGuid().ToString();
-            logWriter = new ConsoleLogWriter();
-            logWriter.ShowDetailedLogs = ShowDetailedLogs;
+            logWriter = new ConsoleLogWriter { ShowDetailedLogs = ShowDetailedLogs };
 
             if (AutoDiscoverServer)
             {
@@ -197,6 +180,30 @@ protected override void Awake()
             }
         }
 
+        private void OnEnable()
+        {
+            Application.logMessageReceived += HandleLog;
+        }
+
+        private void LateUpdate()
+        {
+            if (isTryingToFindServer)
+            {
+                AutoDiscoverUpdate();
+            }
+
+            if (Manager != null)
+            {
+                // Update the XToolsManager to processes any network messages that have arrived
+                Manager.Update();
+            }
+        }
+
+        private void OnDisable()
+        {
+            Application.logMessageReceived -= HandleLog;
+        }
+
         protected override void OnDestroy()
         {
             if (discoveryClient != null)
@@ -232,11 +239,10 @@ protected override void OnDestroy()
                 SessionsTracker = null;
             }
 
-            if (networkConnection != null)
+            if (Connection != null)
             {
-                networkConnection.RemoveListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
-                networkConnection.Dispose();
-                networkConnection = null;
+                Connection.RemoveListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
+                Connection.Dispose();
 
                 if (networkConnectionAdapter != null)
                 {
@@ -257,20 +263,6 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
-        private void LateUpdate()
-        {
-            if (isTryingToFindServer)
-            {
-                AutoDiscoverUpdate();
-            }
-
-            if (Manager != null)
-            {
-                // Update the XToolsManager to processes any network messages that have arrived
-                Manager.Update();
-            }
-        }
-
         private void Connect()
         {
             var config = new ClientConfig(ClientRole);
@@ -287,11 +279,10 @@ private void Connect()
             Manager = SharingManager.Create(config);
 
             //set up callbacks so that we know when we've connected successfully
-            networkConnection = Manager.GetServerConnection();
             networkConnectionAdapter = new NetworkConnectionAdapter();
             networkConnectionAdapter.ConnectedCallback += NetworkConnectionAdapter_ConnectedCallback;
             networkConnectionAdapter.DisconnectedCallback += NetworkConnectionAdapter_ConnectedCallback;
-            networkConnection.AddListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
+            Connection.AddListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
 
             SyncStateListener = new SyncStateListener();
             Manager.RegisterSyncListener(SyncStateListener);
@@ -411,16 +402,6 @@ public void ConnectToServer()
             Manager.SetServerConnectionInfo(ServerAddress, (uint)ServerPort);
         }
 
-        private void OnEnable()
-        {
-            Application.logMessageReceived += HandleLog;
-        }
-
-        private void OnDisable()
-        {
-            Application.logMessageReceived -= HandleLog;
-        }
-
         private void HandleLog(string logString, string stackTrace, LogType type)
         {
             switch (type)
diff --git a/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs b/Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs
