Merge pull request #1698 from Microsoft/Stabilization

MRTK 2017.2.1.2 Patch Release

Assets/HoloToolkit-Examples/Boundary/Materials/Highlight.mat

@@ -59,6 +59,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _Brightness: 1
     - _BumpScale: 1
     - _ColorWriteMask: 15
     - _Cull: 2
@@ -72,6 +73,7 @@ Material:
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
+    - _Opacity: 1
     - _Parallax: 0.02
     - _Shininess: 3
     - _SmoothnessTextureChannel: 0

Assets/HoloToolkit-Examples/Boundary/Scripts/BoundaryTest.cs

@@ -7,11 +7,11 @@ namespace HoloToolkit.Unity.Boundary.Tests
 {
     public class BoundaryTest : MonoBehaviour
     {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         private Material[] defaultMaterials = null;
 
         private void Start()
         {
-#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             BoundaryManager.Instance.RenderBoundary = true;
             BoundaryManager.Instance.RenderFloor = true;
 
@@ -37,10 +37,6 @@ private void Start()
                     defaultMaterials[i].SetColor("_Color", Color.red);
                 }
             }
-#else
-            BoundaryManager.Instance.RenderBoundary = false;
-            BoundaryManager.Instance.RenderFloor = false;
-#endif
         }
 
         private void OnDestroy()
@@ -50,5 +46,6 @@ private void OnDestroy()
                 Destroy(defaultMaterials[i]);
             }
         }
+#endif
     }
 }

Assets/HoloToolkit-Examples/Input/Materials/HoloToolkit_Focusable.mat

@@ -47,6 +47,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _LightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -81,12 +85,14 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
+    - _EmissionUV: 0
     - _ForcePerPixel: 0
     - _Gloss: 1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
     - _Highlight: 0
+    - _LightUV: 0
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
@@ -116,9 +122,11 @@ Material:
     - _ZTest: 4
     - _ZWrite: 1
     m_Colors:
+    - _AmbientFactor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 0.69225776, g: 0.88096607, b: 0.9705882, a: 1}
     - _EmissionColor: {r: 0, g: 0.4468026, b: 0.659, a: 1}
     - _HighlightColor: {r: 0.6317475, g: 0.5650952, b: 0.9852941, a: 1}
+    - _LightmapFactor: {r: 1, g: 1, b: 1, a: 1}
     - _RimColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.6317475, g: 0.5650952, b: 0.9852941, a: 1}
     - _Specular: {r: 0.08, g: 0.075, b: 0.065, a: 1}

Assets/HoloToolkit-Examples/Input/Prefabs/RecordButton.prefab

@@ -40,6 +40,7 @@ GameObject:
   - component: {fileID: 135896787010536334}
   - component: {fileID: 23587063693648524}
   - component: {fileID: 114562897036964206}
+  - component: {fileID: 114506050129553256}
   m_Layer: 0
   m_Name: RecordButton
   m_TagString: Untagged
@@ -114,6 +115,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -129,12 +131,14 @@ MeshRenderer:
   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!23 &23587063693648524
 MeshRenderer:
@@ -145,6 +149,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -160,12 +165,14 @@ MeshRenderer:
   m_PreserveUVs: 1
   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!23 &23896764752200294
 MeshRenderer:
@@ -176,6 +183,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
@@ -191,12 +199,14 @@ MeshRenderer:
   m_PreserveUVs: 1
   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 &33006614140083088
 MeshFilter:
@@ -233,6 +243,21 @@ TextMesh:
   m_Color:
     serializedVersion: 2
     rgba: 4294967295
+--- !u!114 &114506050129553256
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1572548930595686}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  containerObject: {fileID: 0}
+  alignmentType: 0
+  stationarySpaceTypePosition: {x: 0, y: 0, z: 0}
+  roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0}
 --- !u!114 &114562897036964206
 MonoBehaviour:
   m_ObjectHideFlags: 1