Update SampleProject - 0.11.1

SampleProject/Assets/MRTK/Shaders/MRTK.Shaders.sentinel

@@ -1 +1 @@
-ver: 0
+ver: 1

SampleProject/Assets/MRTK/Shaders/MixedRealityStandard.shader

@@ -142,6 +142,7 @@ Shader "Mixed Reality Toolkit/Standard"
 
             #pragma multi_compile_instancing
             #pragma multi_compile _ LIGHTMAP_ON
+            #pragma multi_compile _ UNITY_UI_CLIP_RECT
             #pragma multi_compile _ _HOVER_LIGHT_MEDIUM _HOVER_LIGHT_HIGH
             #pragma multi_compile _ _CLIPPING_PLANE _CLIPPING_SPHERE _CLIPPING_BOX
 
@@ -186,6 +187,7 @@ Shader "Mixed Reality Toolkit/Standard"
             #define IF(a, b, c) lerp(b, c, step((fixed) (a), 0.0)); 
 
             #include "UnityCG.cginc"
+            #include "UnityUI.cginc"
             #include "UnityStandardConfig.cginc"
             #include "UnityStandardUtils.cginc"
             #include "MixedRealityShaderUtils.cginc"
@@ -211,7 +213,13 @@ Shader "Mixed Reality Toolkit/Standard"
             #undef _WORLD_POSITION
 #endif
 
-#if defined(_ALPHATEST_ON) || defined(_CLIPPING_PRIMITIVE) || defined(_ROUND_CORNERS)
+#if defined(UNITY_UI_CLIP_RECT)
+            #define _LOCAL_POSITION
+#else
+            #undef _LOCAL_POSITION
+#endif
+
+#if defined(_ALPHATEST_ON) || defined(UNITY_UI_CLIP_RECT) || defined(_CLIPPING_PRIMITIVE) || defined(_ROUND_CORNERS)
             #define _ALPHA_CLIP
 #else
             #undef _ALPHA_CLIP
@@ -298,6 +306,9 @@ Shader "Mixed Reality Toolkit/Standard"
                 float3 worldPosition : TEXCOORD2;
 #endif
 #endif
+#if defined(_LOCAL_POSITION)
+                float3 localPosition : TEXCOORD7;
+#endif
 #if defined(_SCALE)
                 float3 scale : TEXCOORD3;
 #endif
@@ -345,6 +356,10 @@ Shader "Mixed Reality Toolkit/Standard"
             fixed _Cutoff;
 #endif
 
+#if defined(UNITY_UI_CLIP_RECT)
+            float4 _ClipRect;
+#endif
+
             fixed _Metallic;
             fixed _Smoothness;
 
@@ -623,6 +638,10 @@ Shader "Mixed Reality Toolkit/Standard"
                 o.worldPosition.xyz = worldVertexPosition;
 #endif
 
+#if defined(_LOCAL_POSITION)
+                o.localPosition.xyz = vertexPosition;
+#endif
+
 #if defined(_NEAR_PLANE_FADE)
                 float rangeInverse = 1.0 / (_FadeBeginDistance - _FadeCompleteDistance);
 #if defined(_NEAR_LIGHT_FADE)
@@ -1029,6 +1048,10 @@ Shader "Mixed Reality Toolkit/Standard"
                 pointToLight *= roundCornerClip;
 #endif
 
+#ifdef UNITY_UI_CLIP_RECT
+                albedo.a *= UnityGet2DClipping(i.localPosition.xy, _ClipRect);
+#endif
+
 #if defined(_ALPHA_CLIP)
 #if !defined(_ALPHATEST_ON)
                 _Cutoff = 0.5;

SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DMapExample/2DMapExample.unity

@@ -220,6 +220,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 0
   _areRoadsEnabled: 1
   _areLabelsEnabled: 1

SampleProject/Assets/Microsoft.Maps.Unity.Examples/2DPanelExample/2DPanelExample.unity

@@ -2361,6 +2361,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b43805b646baceb4d9f28507342754b0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 0.5
   _urlFormatString: http://mesonet.agron.iastate.edu/cache/tile.py/1.0.0/nexrad-n0q-900913/{zoomLevel}/{x}/{y}.jpg
   _subdomains: []
 --- !u!114 &1276686191
@@ -2523,6 +2524,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 0
   _areRoadsEnabled: 1
   _areLabelsEnabled: 1

SampleProject/Assets/Microsoft.Maps.Unity.Examples/CityTourExample/CityTourExample.unity

@@ -648,6 +648,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 1
   _areRoadsEnabled: 0
   _areLabelsEnabled: 0

SampleProject/Assets/Microsoft.Maps.Unity.Examples/Common/Prefabs/NearSettingsMenu.prefab

@@ -1100,7 +1100,7 @@ MonoBehaviour:
   visualizationObject: {fileID: 0}
   interactableObject: {fileID: 0}
   autoFollowAtDistance: 0
-  autoFollowDistance: 2
+  autoFollowDistance: 3
   autoFollowTransformTarget: {fileID: 0}
   autoFollowTriggered:
     m_PersistentCalls:
@@ -1733,6 +1733,9 @@ MonoBehaviour:
   oneHandRotationModeNear: 1
   oneHandRotationModeFar: 1
   releaseBehavior: 3
+  transformSmoothingLogicType:
+    reference: Microsoft.MixedReality.Toolkit.Utilities.DefaultTransformSmoothingLogic,
+      Microsoft.MixedReality.Toolkit.SDK
   smoothingFar: 1
   smoothingNear: 1
   moveLerpTime: 0.001

SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/CustomElevationExample.unity

@@ -1443,6 +1443,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 1
   _areRoadsEnabled: 0
   _areLabelsEnabled: 0

SampleProject/Assets/Microsoft.Maps.Unity.Examples/CustomElevationExample/Shaders/CustomTerrainShader.shader

@@ -47,6 +47,7 @@ Shader "Maps SDK/Custom Terrain Shader"
         sampler2D _MainTex3;
         float4 _TexScaleAndOffset[4];
         float _UseSolidColor;
+        float4 _TexOpacity;
 
         struct Input
         {
@@ -91,8 +92,9 @@ Shader "Maps SDK/Custom Terrain Shader"
             v.tangent = float4(1, 0, 0, -1);
         }
 
-        fixed4 blend(fixed4 dst, fixed4 src)
+        fixed4 blend(fixed4 dst, fixed4 src, float additionalAlpha)
         {
+            src.a *= additionalAlpha;
             return fixed4(src.rgb * src.a + dst.rgb * (1.0 - src.a), 1);
         }
 
@@ -107,7 +109,7 @@ Shader "Maps SDK/Custom Terrain Shader"
                 color = tex2D(_MainTex0, IN.uv_MainTex);
                 if (_MainTexCount > 1)
                 {
-                    color = blend(color, tex2D(_MainTex1, IN.uv_MainTex1));
+                    color = blend(color, tex2D(_MainTex1, IN.uv_MainTex1), _TexOpacity.y);
                 }
             }
 

SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapPinExample/MapPinExample.unity

@@ -819,6 +819,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 1
   _areRoadsEnabled: 0
   _areLabelsEnabled: 0

SampleProject/Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity

@@ -686,6 +686,7 @@ MonoBehaviour:
   m_Script: {fileID: 1124163735, guid: f58183a31672bf641bbeeaef3d4759c0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _opacity: 1
   _imageryType: 1
   _areRoadsEnabled: 0
   _areLabelsEnabled: 0

SampleProject/Packages/manifest.json

@@ -17,16 +17,16 @@
     }
   ],
   "dependencies": {
-    "com.microsoft.maps.unity": "0.11.0",
-    "com.microsoft.mixedreality.toolkit.examples": "2.6.2",
-    "com.microsoft.mixedreality.toolkit.foundation": "2.6.2",
-    "com.microsoft.mixedreality.toolkit.tools": "2.6.2",
+    "com.microsoft.maps.unity": "0.11.1",
+    "com.microsoft.mixedreality.toolkit.examples": "2.7.2",
+    "com.microsoft.mixedreality.toolkit.foundation": "2.7.2",
+    "com.microsoft.mixedreality.toolkit.tools": "2.7.2",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ide.rider": "1.2.1",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.vscode": "1.2.4",
     "com.unity.multiplayer-hlapi": "1.0.8",
-    "com.unity.test-framework": "1.1.27",
+    "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "2.1.6",
     "com.unity.timeline": "1.2.18",
     "com.unity.ugui": "1.0.0",

SampleProject/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.29f1
-m_EditorVersionWithRevision: 2019.4.29f1 (0eeae20b1d82)
+m_EditorVersion: 2019.4.30f1
+m_EditorVersionWithRevision: 2019.4.30f1 (e8c891080a1f)