Merge pull request #742 from StephenHodgson/HTK-WorldAnchorManagerUpdate

Update to WorldAnchorManager and added MultiLens capabilities

Author: StephenHodgson

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

@@ -2,15 +2,15 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
-using System.Collections.Generic;
 using UnityEngine.Networking;
-using HoloToolkit.Unity;
-using System;
 
 #if UNITY_WSA
+using System;
+using System.Collections.Generic;
 using UnityEngine.VR.WSA.Sharing;
 using UnityEngine.VR.WSA;
 using UnityEngine.VR.WSA.Persistence;
+using HoloToolkit.Unity;
 #endif
 
 namespace HoloToolkit.Examples.SharingWithUNET
@@ -38,23 +38,12 @@ public static UNetAnchorManager Instance
             }
         }
 
-        /// <summary>
-        /// Sometimes we'll see a really small anchor blob get generated.
-        /// These tend to not work, so we have a minimum trustable size.
-        /// </summary>
-        private const uint minTrustworthySerializedAnchorDataSize = 500000;
-
         /// <summary>
         /// Keeps track of the name of the world anchor to use.
         /// </summary>
         [SyncVar]
         public string AnchorName = "";
 
-        /// <summary>
-        /// List of bytes that represent the anchor data to export.
-        /// </summary>
-        private List<byte> exportingAnchorBytes = new List<byte>();
-
         /// <summary>
         /// The UNet network manager in the scene.
         /// </summary>
@@ -65,15 +54,27 @@ public static UNetAnchorManager Instance
         /// </summary>
         private GenericNetworkTransmitter networkTransmitter;
 
+#if UNITY_WSA
         /// <summary>
-        /// Keeps track of if we created the anchor.
+        /// The object to attach the anchor to when created or imported.
         /// </summary>
-        private bool createdAnchor = false;
+        private GameObject objectToAnchor;
 
         /// <summary>
-        /// The object to attach the anchor to when created or imported.
+        /// Sometimes we'll see a really small anchor blob get generated.
+        /// These tend to not work, so we have a minimum trustworthy size.
         /// </summary>
-        private GameObject objectToAnchor;
+        private const uint MinTrustworthySerializedAnchorDataSize = 500000;
+
+        /// <summary>
+        /// List of bytes that represent the anchor data to export.
+        /// </summary>
+        private List<byte> exportingAnchorBytes = new List<byte>(0);
+
+        /// <summary>
+        /// Keeps track of if we created the anchor.
+        /// </summary>
+        private bool createdAnchor = false;
 
         /// <summary>
         /// Previous anchor name.
@@ -95,6 +96,7 @@ public static UNetAnchorManager Instance
         /// </summary>
         private string exportingAnchorName;
 
+#endif
         /// <summary>
         /// Tracks if we have a shared anchor established
         /// </summary>
@@ -135,10 +137,10 @@ private bool CheckConfiguration()
                 Debug.Log("No SharedCollection found in scene");
                 return false;
             }
-            else
-            {
+
+#if UNITY_WSA
                 objectToAnchor = SharedCollection.Instance.gameObject;
-            }
+#endif
 
             return true;
         }
@@ -161,11 +163,13 @@ private void Start()
         /// <param name="data">The data blob to import.</param>
         private void NetworkTransmitter_dataReadyEvent(byte[] data)
         {
+#if UNITY_WSA
             Debug.Log("Anchor data arrived.");
             anchorData = data;
             Debug.Log(data.Length);
             DownloadingAnchor = false;
             gotOne = true;
+#endif
         }
 
         /// <summary>
@@ -223,6 +227,7 @@ private bool AttachToCachedAnchor(string anchorName)
             return false;
         }
 
+#if UNITY_WSA
         /// <summary>
         /// Called as anchor data becomes available to export
         /// </summary>
@@ -232,7 +237,6 @@ private void WriteBuffer(byte[] data)
             exportingAnchorBytes.AddRange(data);
         }
 
-#if UNITY_WSA
         private void Update()
         {
             if (gotOne)
@@ -293,7 +297,7 @@ private void ImportComplete(SerializationCompletionReason status, WorldAnchorTra
         /// <param name="status">If the serialization succeeded.</param>
         private void ExportComplete(SerializationCompletionReason status)
         {
-            if (status == SerializationCompletionReason.Succeeded && exportingAnchorBytes.Count > minTrustworthySerializedAnchorDataSize)
+            if (status == SerializationCompletionReason.Succeeded && exportingAnchorBytes.Count > MinTrustworthySerializedAnchorDataSize)
             {
                 AnchorName = exportingAnchorName;
                 anchorData = exportingAnchorBytes.ToArray();

Assets/HoloToolkit-Tests/Sharing/Prefabs/AnchorDebug.prefab

@@ -0,0 +1,192 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1263896259355700}
+  m_IsPrefabParent: 1
+--- !u!1 &1142360440761678
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4097222579833928}
+  - component: {fileID: 23794762112030164}
+  - component: {fileID: 102277783203209222}
+  m_Layer: 0
+  m_Name: AnchorText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1263896259355700
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4181948179430244}
+  - component: {fileID: 33232791332337668}
+  - component: {fileID: 135521382791405888}
+  - component: {fileID: 23351611205389120}
+  - component: {fileID: 114202258574957562}
+  m_Layer: 0
+  m_Name: AnchorDebug
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4097222579833928
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142360440761678}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.6, z: 0}
+  m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 0.024999999}
+  m_Children: []
+  m_Father: {fileID: 4181948179430244}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4181948179430244
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1263896259355700}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_Children:
+  - {fileID: 4097222579833928}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23351611205389120
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1263896259355700}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 474f0e0481d4aa14e92a5ada98042f3a, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!23 &23794762112030164
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142360440761678}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &33232791332337668
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1263896259355700}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!102 &102277783203209222
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1142360440761678}
+  m_Text: No Server Connection
+  m_OffsetZ: 0
+  m_CharacterSize: 1
+  m_LineSpacing: 1
+  m_Anchor: 7
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 48
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967295
+--- !u!114 &114202258574957562
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1263896259355700}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac8d5b128a1d8204fb76c86f47b75912, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PivotAxis: 0
+--- !u!135 &135521382791405888
+SphereCollider:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1263896259355700}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}