Merge pull request #3020 from davidkline-ms/spatialMerge2

Merge development branch changes into spatial awareness feature branch

Author: David Kline

.gitignore

@@ -12,10 +12,18 @@ UWP/
 WindowsStoreApp/
 UnityGenerated/
 UnityPackageManager/
+.out/
 project.json
 project.lock.json
-WSATestCertificate.pfx
-WSATestCertificate.pfx.meta
+*.package
+
+# ============ #
+# Certificates #
+# ============ #
+*.cert
+*.privkey
+*.pfx
+*.pfx.meta
 
 # ===================================== #
 # Visual Studio / MonoDevelop generated #

Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity

@@ -153,7 +153,7 @@ GameObject:
   - component: {fileID: 431339712}
   - component: {fileID: 431339711}
   m_Layer: 0
-  m_Name: MixedRealityManager
+  m_Name: MixedRealityToolkit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -376,7 +376,7 @@ GameObject:
   m_Component:
   - component: {fileID: 874911121}
   m_Layer: 0
-  m_Name: Body
+  m_Name: MixedRealityPlayspace
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -642,6 +642,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   sourceQuality: 0
+  influencerController: {fileID: 1014969685}
 --- !u!114 &1014969685
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -655,7 +656,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   updateInterval: 0.25
   maxDistance: 20
-  MaxObjects: 10
+  maxObjects: 10
+  audioSource: {fileID: 1014969681}
 --- !u!1 &1353076106
 GameObject:
   m_ObjectHideFlags: 0

Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity

@@ -476,7 +476,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   updateInterval: 0.25
   maxDistance: 20
-  MaxObjects: 10
+  maxObjects: 10
+  audioSource: {fileID: 977203055}
 --- !u!135 &977203057
 SphereCollider:
   m_ObjectHideFlags: 0
@@ -541,7 +542,7 @@ GameObject:
   - component: {fileID: 979633973}
   - component: {fileID: 979633972}
   m_Layer: 0
-  m_Name: MixedRealityManager
+  m_Name: MixedRealityToolkit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -801,7 +802,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1912278560}
   m_Layer: 0
-  m_Name: Body
+  m_Name: MixedRealityPlayspace
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity

@@ -640,7 +640,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1289414260}
   m_Layer: 0
-  m_Name: Body
+  m_Name: MixedRealityPlayspace
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -740,7 +740,7 @@ GameObject:
   - component: {fileID: 1485507613}
   - component: {fileID: 1485507612}
   m_Layer: 0
-  m_Name: MixedRealityManager
+  m_Name: MixedRealityToolkit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -785,7 +785,7 @@ GameObject:
   - component: {fileID: 1491404206}
   - component: {fileID: 1491404205}
   m_Layer: 0
-  m_Name: Head
+  m_Name: Main Camera
   m_TagString: MainCamera
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs

@@ -4,8 +4,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Boundary;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.BoundarySystem;
-using Microsoft.MixedReality.Toolkit.Core.Managers;
-using Microsoft.MixedReality.Toolkit.Core.Utilities;
+using Microsoft.MixedReality.Toolkit.Core.Services;
 using System.Collections.Generic;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using UnityEngine;
@@ -42,13 +41,13 @@ private void Awake()
         {
             markerParent = new GameObject();
             markerParent.name = "Boundary Demo Markers";
-            markerParent.transform.parent = CameraCache.Main.transform.parent;
+            markerParent.transform.parent = MixedRealityToolkit.Instance.MixedRealityPlayspace;
         }
 
         private void Start()
         {
 
-            if (MixedRealityManager.BoundarySystem != null)
+            if (MixedRealityToolkit.BoundarySystem != null)
             {
                 if (markers.Count == 0)
                 {
@@ -59,25 +58,25 @@ private void Start()
 
         private void Update()
         {
-            if (MixedRealityManager.BoundarySystem != null)
+            if (MixedRealityToolkit.BoundarySystem != null)
             {
-                MixedRealityManager.BoundarySystem.ShowFloor = showFloor;
-                MixedRealityManager.BoundarySystem.ShowPlayArea = showPlayArea;
-                MixedRealityManager.BoundarySystem.ShowTrackedArea = showTrackedArea;
-                MixedRealityManager.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
-                MixedRealityManager.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
+                MixedRealityToolkit.BoundarySystem.ShowFloor = showFloor;
+                MixedRealityToolkit.BoundarySystem.ShowPlayArea = showPlayArea;
+                MixedRealityToolkit.BoundarySystem.ShowTrackedArea = showTrackedArea;
+                MixedRealityToolkit.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
+                MixedRealityToolkit.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
             }
         }
 
         private async void OnEnable()
         {
-            await new WaitUntil(() => MixedRealityManager.BoundarySystem != null);
-            MixedRealityManager.BoundarySystem.Register(gameObject);
+            await new WaitUntil(() => MixedRealityToolkit.BoundarySystem != null);
+            MixedRealityToolkit.BoundarySystem.Register(gameObject);
         }
 
         private void OnDisable()
         {
-            MixedRealityManager.BoundarySystem?.Unregister(gameObject);
+            MixedRealityToolkit.BoundarySystem?.Unregister(gameObject);
         }
 
         #endregion MonoBehaviour Implementation
@@ -104,13 +103,13 @@ private void AddMarkers()
             float widthRect;
             float heightRect;
 
-            if (!MixedRealityManager.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
+            if (!MixedRealityToolkit.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
             {
                 // If we have no boundary manager or rectangular bounds we will show no indicators
                 return;
             }
 
-            MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityManager.Instance.ActiveProfile.BoundaryVisualizationProfile;
+            MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityToolkit.Instance.ActiveProfile.BoundaryVisualizationProfile;
             if (visualizationProfile == null)
             {
                 // We do not have a visualization profile configured, therefore do not render the indicators.
@@ -135,12 +134,12 @@ private void AddMarkers()
 
                     Material material = null;
                     // Check inscribed rectangle first
-                    if (MixedRealityManager.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
+                    if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
                     {
                         material = visualizationProfile.PlayAreaMaterial;
                     }
                     // Then check geometry
-                    else if (MixedRealityManager.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
+                    else if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
                     {
                         material = visualizationProfile.TrackedAreaMaterial;
                     }

Assets/MixedRealityToolkit-Examples/Demos/Solvers.meta

@@ -0,0 +1,132 @@
+%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: 1307245229378308}
+  m_IsPrefabParent: 1
+--- !u!1 &1307245229378308
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4730916243282228}
+  - component: {fileID: 114229151188300204}
+  - component: {fileID: 114604167685196832}
+  - component: {fileID: 33503633605293008}
+  - component: {fileID: 23066390738997328}
+  m_Layer: 0
+  m_Name: ChaseSource
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4730916243282228
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1307245229378308}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.025, y: 0.025, z: 0.025}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23066390738997328
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1307245229378308}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 2100000, guid: c4a1b7475a654dd0acaa0cfdfba2e20c, 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: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 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 &33503633605293008
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1307245229378308}
+  m_Mesh: {fileID: 4300000, guid: 841b5755ac02dbc439bd347f414de999, type: 3}
+--- !u!114 &114229151188300204
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1307245229378308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  handedness: 1
+  trackedObjectToReference: 2
+  additionalOffset: {x: 0, y: 0, z: 0}
+  additionalRotation: {x: 0, y: 0, z: 0}
+  transformTarget: {fileID: 0}
+  updateSolvers: 1
+--- !u!114 &114604167685196832
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1307245229378308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4684083f6dff4a1d8a790bccc354fcf4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  updateLinkedTransform: 0
+  moveLerpTime: 0.1
+  rotateLerpTime: 0.1
+  scaleLerpTime: 0
+  maintainScale: 1
+  smoothing: 1
+  lifetime: 0
+  SolverHandler: {fileID: 114229151188300204}
+  referenceDirection: 0
+  minDistance: 0.1
+  maxDistance: 0.1
+  minViewDegrees: 0
+  maxViewDegrees: 0
+  aspectV: 1
+  ignoreAngleClamp: 0
+  ignoreDistanceClamp: 0
+  orientToReferenceDirection: 0