Update SampleProject - 0.10.2

SampleProject/.gitignore

@@ -23,6 +23,7 @@ obj/
 *.unityproj
 *.booproj
 .vscode
+.vsconfig
 
 # ============ #
 # OS generated #
@@ -43,3 +44,4 @@ Packages_/
 !*.meta
 Assets/Packages.meta
 Assets/WSATestCertificate.pfx.*
+Build/

SampleProject/Assets/MRTK/Shaders/ChannelPacker.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 Shader "Hidden/ChannelPacker"
 {
     Properties

SampleProject/Assets/MRTK/Shaders/DepthBufferPostProcess.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 Shader "Mixed Reality Toolkit/Depth Buffer Viewer"
 {
     Properties

SampleProject/Assets/MRTK/Shaders/InstancedColored.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 Shader "Hidden/Instanced-Colored"
 {
     Properties

SampleProject/Assets/MRTK/Shaders/InvisibleShader.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 Shader "Mixed Reality Toolkit/InvisibleShader" {
 
 	Subshader

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

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

SampleProject/Assets/MRTK/Shaders/MRTK_Wireframe.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 ///
 /// Basic wireframe shader that can be used for rendering spatial mapping meshes.
 ///

SampleProject/Assets/MRTK/Shaders/MixedRealityShaderUtils.cginc

@@ -13,16 +13,16 @@ inline float PointVsPlane(float3 worldPosition, float4 plane)
 #endif
 
 #if defined(_CLIPPING_SPHERE)
-inline float PointVsSphere(float3 worldPosition, float4 sphere)
+inline float PointVsSphere(float3 worldPosition, float4x4 sphereInverseTransform)
 {
-    return distance(worldPosition, sphere.xyz) - sphere.w;
+    return length(mul(sphereInverseTransform, float4(worldPosition, 1.0)).xyz) - 0.5;
 }
 #endif
 
 #if defined(_CLIPPING_BOX)
-inline float PointVsBox(float3 worldPosition, float3 boxSize, float4x4 boxInverseTransform)
+inline float PointVsBox(float3 worldPosition, float4x4 boxInverseTransform)
 {
-    float3 distance = abs(mul(boxInverseTransform, float4(worldPosition, 1.0))) - boxSize;
+    float3 distance = abs(mul(boxInverseTransform, float4(worldPosition, 1.0))) - 0.5;
     return length(max(distance, 0.0)) + min(max(distance.x, max(distance.y, distance.z)), 0.0);
 }
 #endif

SampleProject/Assets/MRTK/Shaders/MixedRealityStandard.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 Shader "Mixed Reality Toolkit/Standard"
 {
     Properties
@@ -21,6 +24,8 @@ Shader "Mixed Reality Toolkit/Standard"
         [Toggle(_EMISSION)] _EnableEmission("Enable Emission", Float) = 0.0
         [HDR]_EmissiveColor("Emissive Color", Color) = (0.0, 0.0, 0.0, 1.0)
         [Toggle(_TRIPLANAR_MAPPING)] _EnableTriplanarMapping("Triplanar Mapping", Float) = 0.0
+        [Toggle(_USE_SSAA)] _EnableSSAA("Super Sample Anti Aliasing", Float) = 0.0
+        _MipmapBias("Mipmap Bias", Range(-5.0, 0.0)) = -2.0
         [Toggle(_LOCAL_SPACE_TRIPLANAR_MAPPING)] _EnableLocalSpaceTriplanarMapping("Local Space", Float) = 0.0
         _TriplanarMappingBlendSharpness("Blend Sharpness", Range(1.0, 16.0)) = 4.0
 
@@ -101,7 +106,6 @@ Shader "Mixed Reality Toolkit/Standard"
         [Enum(UnityEngine.Rendering.ColorWriteMask)] _ColorWriteMask("Color Write Mask", Float) = 15 // "All"
         [Enum(UnityEngine.Rendering.CullMode)] _CullMode("Cull Mode", Float) = 2                     // "Back"
         _RenderQueueOverride("Render Queue Override", Range(-1.0, 5000)) = -1
-        [Toggle(_INSTANCED_COLOR)] _InstancedColor("Instanced Color", Float) = 0.0
         [Toggle(_IGNORE_Z_SCALE)] _IgnoreZScale("Ignore Z Scale", Float) = 0.0
         [Toggle(_STENCIL)] _Stencil("Enable Stencil Testing", Float) = 0.0
         _StencilReference("Stencil Reference", Range(0, 255)) = 0
@@ -149,6 +153,7 @@ Shader "Mixed Reality Toolkit/Standard"
             #pragma shader_feature _EMISSION
             #pragma shader_feature _TRIPLANAR_MAPPING
             #pragma shader_feature _LOCAL_SPACE_TRIPLANAR_MAPPING
+            #pragma shader_feature _USE_SSAA
             #pragma shader_feature _DIRECTIONAL_LIGHT
             #pragma shader_feature _SPECULAR_HIGHLIGHTS
             #pragma shader_feature _SPHERICAL_HARMONICS
@@ -176,7 +181,6 @@ Shader "Mixed Reality Toolkit/Standard"
             #pragma shader_feature _INNER_GLOW
             #pragma shader_feature _IRIDESCENCE
             #pragma shader_feature _ENVIRONMENT_COLORING
-            #pragma shader_feature _INSTANCED_COLOR
             #pragma shader_feature _IGNORE_Z_SCALE
 
             #define IF(a, b, c) lerp(b, c, step((fixed) (a), 0.0)); 
@@ -186,8 +190,8 @@ Shader "Mixed Reality Toolkit/Standard"
             #include "UnityStandardUtils.cginc"
             #include "MixedRealityShaderUtils.cginc"
 
-            // This define will get commented in by the UpgradeShaderForLightweightRenderPipeline method.
+            // This define will get commented in by the UpgradeShaderForUniversalRenderPipeline method.
-            //#define _LIGHTWEIGHT_RENDER_PIPELINE
+            //#define _RENDER_PIPELINE
 
 #if defined(_TRIPLANAR_MAPPING) || defined(_DIRECTIONAL_LIGHT) || defined(_SPHERICAL_HARMONICS) || defined(_REFLECTIONS) || defined(_RIM_LIGHT) || defined(_PROXIMITY_LIGHT) || defined(_ENVIRONMENT_COLORING)
             #define _NORMAL
@@ -310,19 +314,30 @@ Shader "Mixed Reality Toolkit/Standard"
                 fixed3 worldNormal : COLOR3;
 #endif
 #endif
-                UNITY_VERTEX_OUTPUT_STEREO
-#if defined(_INSTANCED_COLOR)
                 UNITY_VERTEX_INPUT_INSTANCE_ID
-#endif
+                UNITY_VERTEX_OUTPUT_STEREO
             };
 
-#if defined(_INSTANCED_COLOR)
             UNITY_INSTANCING_BUFFER_START(Props)
             UNITY_DEFINE_INSTANCED_PROP(float4, _Color)
-            UNITY_INSTANCING_BUFFER_END(Props)
+
-#else
+#if defined(_CLIPPING_PLANE)
-            fixed4 _Color;
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipPlaneSide)
+            UNITY_DEFINE_INSTANCED_PROP(float4, _ClipPlane)
 #endif
+
+#if defined(_CLIPPING_SPHERE)
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipSphereSide)
+            UNITY_DEFINE_INSTANCED_PROP(float4x4, _ClipSphereInverseTransform)
+#endif
+
+#if defined(_CLIPPING_BOX)
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipBoxSide)
+            UNITY_DEFINE_INSTANCED_PROP(float4x4, _ClipBoxInverseTransform)
+#endif
+
+            UNITY_INSTANCING_BUFFER_END(Props)
+
             sampler2D _MainTex;
             fixed4 _MainTex_ST;
 
@@ -346,12 +361,16 @@ Shader "Mixed Reality Toolkit/Standard"
             fixed4 _EmissiveColor;
 #endif
 
+#if defined(_USE_SSAA)
+            float _MipmapBias;
+#endif
+
 #if defined(_TRIPLANAR_MAPPING)
             float _TriplanarMappingBlendSharpness;
 #endif
 
 #if defined(_DIRECTIONAL_LIGHT)
-#if defined(_LIGHTWEIGHT_RENDER_PIPELINE)
+#if defined(_RENDER_PIPELINE)
             CBUFFER_START(_LightBuffer)
             float4 _MainLightPosition;
             half4 _MainLightColor;
@@ -374,21 +393,6 @@ Shader "Mixed Reality Toolkit/Standard"
             float _VertexExtrusionValue;
 #endif
 
-#if defined(_CLIPPING_PLANE)
-            fixed _ClipPlaneSide;
-            float4 _ClipPlane;
-#endif
-
-#if defined(_CLIPPING_SPHERE)
-            fixed _ClipSphereSide;
-            float4 _ClipSphere;
-#endif
-
-#if defined(_CLIPPING_BOX)
-            fixed _ClipBoxSide;
-            float4 _ClipBoxSize;
-            float4x4 _ClipBoxInverseTransform;
-#endif
 
 #if defined(_CLIPPING_PRIMITIVE)
             float _BlendedClippingWidth;
@@ -569,10 +573,10 @@ Shader "Mixed Reality Toolkit/Standard"
             {
                 v2f o;
                 UNITY_SETUP_INSTANCE_ID(v);
+                UNITY_INITIALIZE_OUTPUT(v2f, o);
                 UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
-#if defined(_INSTANCED_COLOR)
                 UNITY_TRANSFER_INSTANCE_ID(v, o);
-#endif
+
                 float4 vertexPosition = v.vertex;
 
 #if defined(_WORLD_POSITION) || defined(_VERTEX_EXTRUSION)
@@ -753,9 +757,7 @@ Shader "Mixed Reality Toolkit/Standard"
 
             fixed4 frag(v2f i, fixed facing : VFACE) : SV_Target
             {
-#if defined(_INSTANCED_COLOR)
                 UNITY_SETUP_INSTANCE_ID(i);
-#endif
 
 #if defined(_TRIPLANAR_MAPPING)
                 // Calculate triplanar uvs and apply texture scale and offset values like TRANSFORM_TEX.
@@ -780,10 +782,25 @@ Shader "Mixed Reality Toolkit/Standard"
                 fixed4 albedo = tex2D(_MainTex, uvX) * triplanarBlend.x + 
                                 tex2D(_MainTex, uvY) * triplanarBlend.y + 
                                 tex2D(_MainTex, uvZ) * triplanarBlend.z;
+#else
+#if defined(_USE_SSAA)
+                // Does SSAA on the texture, implementation based off this article: https://medium.com/@bgolus/sharper-mipmapping-using-shader-based-supersampling-ed7aadb47bec
+                // per pixel screen space partial derivatives
+                float2 dx = ddx(i.uv.xy) * 0.25; // horizontal offset
+                float2 dy = ddy(i.uv.xy) * 0.25; // vertical offset
+                // supersampled 2x2 ordered grid
+                fixed4 albedo = 0;
+                albedo += tex2Dbias(_MainTex, float4(i.uv.xy + dx + dy, 0.0, _MipmapBias));
+                albedo += tex2Dbias(_MainTex, float4(i.uv.xy - dx + dy, 0.0, _MipmapBias));
+                albedo += tex2Dbias(_MainTex, float4(i.uv.xy + dx - dy, 0.0, _MipmapBias));
+                albedo += tex2Dbias(_MainTex, float4(i.uv.xy - dx - dy, 0.0, _MipmapBias));
+                albedo *= 0.25;
 #else
                 fixed4 albedo = tex2D(_MainTex, i.uv);
 #endif
 #endif
+#endif
+
 
 #ifdef LIGHTMAP_ON
                 albedo.rgb *= DecodeLightmap(UNITY_SAMPLE_TEX2D(unity_Lightmap, i.lightMapUV));
@@ -808,13 +825,19 @@ Shader "Mixed Reality Toolkit/Standard"
 #if defined(_CLIPPING_PRIMITIVE)
                 float primitiveDistance = 1.0;
 #if defined(_CLIPPING_PLANE)
-                primitiveDistance = min(primitiveDistance, PointVsPlane(i.worldPosition.xyz, _ClipPlane) * _ClipPlaneSide);
+                fixed clipPlaneSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipPlaneSide);
+                float4 clipPlane = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipPlane);
+                primitiveDistance = min(primitiveDistance, PointVsPlane(i.worldPosition.xyz, clipPlane) * clipPlaneSide);
 #endif
 #if defined(_CLIPPING_SPHERE)
-                primitiveDistance = min(primitiveDistance, PointVsSphere(i.worldPosition.xyz, _ClipSphere) * _ClipSphereSide);
+                fixed clipSphereSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipSphereSide);
+                float4x4 clipSphereInverseTransform = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipSphereInverseTransform);
+                primitiveDistance = min(primitiveDistance, PointVsSphere(i.worldPosition.xyz, clipSphereInverseTransform) * clipSphereSide);
 #endif
 #if defined(_CLIPPING_BOX)
-                primitiveDistance = min(primitiveDistance, PointVsBox(i.worldPosition.xyz, _ClipBoxSize.xyz, _ClipBoxInverseTransform) * _ClipBoxSide);
+                fixed clipBoxSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipBoxSide);
+                float4x4 clipBoxInverseTransform = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipBoxInverseTransform);
+                primitiveDistance = min(primitiveDistance, PointVsBox(i.worldPosition.xyz, clipBoxInverseTransform) * clipBoxSide);
 #endif
 #if defined(_CLIPPING_BORDER)
                 fixed3 primitiveBorderColor = lerp(_ClippingBorderColor, fixed3(0.0, 0.0, 0.0), primitiveDistance / _ClippingBorderWidth);
@@ -872,11 +895,7 @@ Shader "Mixed Reality Toolkit/Standard"
                 float roundCornerClip = RoundCorners(roundCornerPosition, cornerCircleDistance, cornerCircleRadius);
 #endif
 
-#if defined(_INSTANCED_COLOR)
                 albedo *= UNITY_ACCESS_INSTANCED_PROP(Props, _Color);
-#else
-                albedo *= _Color;
-#endif
 
 #if defined(_VERTEX_COLORS)
                 albedo *= i.color;
@@ -1023,7 +1042,7 @@ Shader "Mixed Reality Toolkit/Standard"
 
                 // Blinn phong lighting.
 #if defined(_DIRECTIONAL_LIGHT)
-#if defined(_LIGHTWEIGHT_RENDER_PIPELINE)
+#if defined(_RENDER_PIPELINE)
                 float4 directionalLightDirection = _MainLightPosition;
 #else
                 float4 directionalLightDirection = _WorldSpaceLightPos0;
@@ -1070,7 +1089,7 @@ Shader "Mixed Reality Toolkit/Standard"
 #if defined(_DIRECTIONAL_LIGHT)
                 fixed oneMinusMetallic = (1.0 - _Metallic);
                 output.rgb = lerp(output.rgb, ibl, minProperty);
-#if defined(_LIGHTWEIGHT_RENDER_PIPELINE)
+#if defined(_RENDER_PIPELINE)
                 fixed3 directionalLightColor = _MainLightColor.rgb;
 #else
                 fixed3 directionalLightColor = _LightColor0.rgb;
@@ -1154,8 +1173,8 @@ Shader "Mixed Reality Toolkit/Standard"
             #include "UnityCG.cginc"
             #include "UnityMetaPass.cginc"
 
-            // This define will get commented in by the UpgradeShaderForLightweightRenderPipeline method.
+            // This define will get commented in by the UpgradeShaderForUniversalRenderPipeline method.
-            //#define _LIGHTWEIGHT_RENDER_PIPELINE
+            //#define _RENDER_PIPELINE
 
             struct v2f
             {
@@ -1180,7 +1199,7 @@ Shader "Mixed Reality Toolkit/Standard"
             fixed4 _Color;
             fixed4 _EmissiveColor;
 
-#if defined(_LIGHTWEIGHT_RENDER_PIPELINE)
+#if defined(_RENDER_PIPELINE)
             CBUFFER_START(_LightBuffer)
             float4 _MainLightPosition;
             half4 _MainLightColor;
@@ -1202,7 +1221,7 @@ Shader "Mixed Reality Toolkit/Standard"
                 output.Emission += _EmissiveColor;
 #endif
 #endif
-#if defined(_LIGHTWEIGHT_RENDER_PIPELINE)
+#if defined(_RENDER_PIPELINE)
                 output.SpecularColor = _MainLightColor.rgb;
 #else
                 output.SpecularColor = _LightColor0.rgb;

SampleProject/Assets/MRTK/Shaders/MixedRealityTextMeshPro.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 // Simplified SDF shader:
 // - No Shading Option (bevel / bump / env map)
 // - No Glow Option
@@ -197,12 +200,11 @@ SubShader {
 
 #if defined(_CLIPPING_SPHERE)
         fixed _ClipSphereSide;
-        float4 _ClipSphere;
+        float4x4 _ClipSphereInverseTransform;
 #endif
 
 #if defined(_CLIPPING_BOX)
         fixed _ClipBoxSide;
-        float4 _ClipBoxSize;
         float4x4 _ClipBoxInverseTransform;
 #endif
 
@@ -352,10 +354,10 @@ SubShader {
             primitiveDistance = min(primitiveDistance, PointVsPlane(input.worldPosition, _ClipPlane) * _ClipPlaneSide);
 #endif
 #if defined(_CLIPPING_SPHERE)
-            primitiveDistance = min(primitiveDistance, PointVsSphere(input.worldPosition, _ClipSphere) * _ClipSphereSide);
+            primitiveDistance = min(primitiveDistance, PointVsSphere(input.worldPosition, _ClipSphereInverseTransform) * _ClipSphereSide);
 #endif
 #if defined(_CLIPPING_BOX)
-            primitiveDistance = min(primitiveDistance, PointVsBox(input.worldPosition, _ClipBoxSize.xyz, _ClipBoxInverseTransform) * _ClipBoxSide);
+            primitiveDistance = min(primitiveDistance, PointVsBox(input.worldPosition, _ClipBoxInverseTransform) * _ClipBoxSide);
 #endif
             c *= step(0.0, primitiveDistance);
 #endif

SampleProject/Assets/MRTK/Shaders/Text3DShader.shader

@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+// NOTE: MRTK Shaders are versioned via the MRTK.Shaders.sentinel file.
+// When making changes to any shader's source file, the value in the sentinel _must_ be incremented.
+
 ///
 /// Basic 3D TextMesh shader with proper z-sorting and culling options.
 ///
@@ -96,25 +99,24 @@ Shader "Mixed Reality Toolkit/Text3DShader"
 
             UNITY_INSTANCING_BUFFER_START(Props)
             UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
-            #define _Color_arr Props
-            UNITY_INSTANCING_BUFFER_END(Props)
         
         #if defined(_CLIPPING_PLANE)
-            fixed _ClipPlaneSide;
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipPlaneSide)
-            float4 _ClipPlane;
+            UNITY_DEFINE_INSTANCED_PROP(float4, _ClipPlane)
         #endif
 
         #if defined(_CLIPPING_SPHERE)
-            fixed _ClipSphereSide;
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipSphereSide)
-            float4 _ClipSphere;
+            UNITY_DEFINE_INSTANCED_PROP(float4x4, _ClipSphereInverseTransform)
         #endif
 
         #if defined(_CLIPPING_BOX)
-            fixed _ClipBoxSide;
+            UNITY_DEFINE_INSTANCED_PROP(fixed, _ClipBoxSide)
-            float4 _ClipBoxSize;
+            UNITY_DEFINE_INSTANCED_PROP(float4x4, _ClipBoxInverseTransform)
-            float4x4 _ClipBoxInverseTransform;
         #endif
 
+            UNITY_INSTANCING_BUFFER_END(Props)
+
             v2f vert(appdata_t v)
             {
                 v2f o;
@@ -144,19 +146,25 @@ Shader "Mixed Reality Toolkit/Text3DShader"
 
                 half4 col = i.color;
                 col.a *= tex2D(_MainTex, i.texcoord).a;
-                col = col * UNITY_ACCESS_INSTANCED_PROP(_Color_arr, _Color);
+                col = col * UNITY_ACCESS_INSTANCED_PROP(Props, _Color);
                     
                 // Primitive clipping.
         #if defined(_CLIPPING_PRIMITIVE)
                 float primitiveDistance = 1.0;
         #if defined(_CLIPPING_PLANE)
-                primitiveDistance = min(primitiveDistance, PointVsPlane(i.worldPosition, _ClipPlane) * _ClipPlaneSide);
+                fixed clipPlaneSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipPlaneSide);
+                float4 clipPlane = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipPlane);
+                primitiveDistance = min(primitiveDistance, PointVsPlane(i.worldPosition.xyz, clipPlane) * clipPlaneSide);
         #endif
         #if defined(_CLIPPING_SPHERE)
-                primitiveDistance = min(primitiveDistance, PointVsSphere(i.worldPosition, _ClipSphere) * _ClipSphereSide);
+                fixed clipSphereSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipSphereSide);
+                float4x4 clipSphereInverseTransform = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipSphereInverseTransform);
+                primitiveDistance = min(primitiveDistance, PointVsSphere(i.worldPosition.xyz, clipSphereInverseTransform) * clipSphereSide);
         #endif
         #if defined(_CLIPPING_BOX)
-                primitiveDistance = min(primitiveDistance, PointVsBox(i.worldPosition, _ClipBoxSize.xyz, _ClipBoxInverseTransform) * _ClipBoxSide);
+                fixed clipBoxSide = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipBoxSide);
+                float4x4 clipBoxInverseTransform = UNITY_ACCESS_INSTANCED_PROP(Props, _ClipBoxInverseTransform);
+                primitiveDistance = min(primitiveDistance, PointVsBox(i.worldPosition.xyz, clipBoxInverseTransform) * clipBoxSide);
         #endif
                 col *= step(0.0, primitiveDistance);
         #endif

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

@@ -1729,7 +1729,7 @@ MonoBehaviour:
   moveLerpTime: 0.1
   rotateLerpTime: 0.1
   scaleLerpTime: 0
-  maintainScale: 1
+  maintainScaleOnInitialization: 1
   smoothing: 1
   lifetime: 0
   autoStart: 0

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

@@ -4,7 +4,7 @@
 // This shader is based on StandardTerrainShader-MapsSDK.shader, but instead of using explicit vertex and fragment definitions,
 // this shader uses the surface shader approach and adds normal data to elevation sources-- it does not work in areas with 3D model data!
 
-Shader "MapsSDK/CustomTerrainShader"
+Shader "Maps SDK/Custom Terrain Shader"
 {
     Properties
     {
@@ -131,7 +131,6 @@ Shader "MapsSDK/CustomTerrainShader"
                     IN.elevationTex,
                     _ElevationTexScaleAndOffset.x,
                     _ElevationTexScaleAndOffset.yz,
-                    _ElevationTexScaleAndOffset.w,
                     1.0 / 257.0,
                     1.0);
             float3 worldNormal = UnityObjectToWorldNormal(localNormal);

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

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1889,8 +1889,8 @@ Camera:
   m_GameObject: {fileID: 528144770}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -1904,7 +1904,7 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.1
-  far clip plane: 1000
+  far clip plane: 50
   field of view: 60
   orthographic: 0
   orthographic size: 5
@@ -4892,6 +4892,8 @@ MonoBehaviour:
   _mapEdgeColor: {r: 0.28627455, g: 0.5784523, b: 1, a: 0.2784314}
   _mapEdgeColorFadeDistance: 0.01
   _detailOffset: 1
+  _numElevationTileFallbackLods: 2
+  _requestTilesAroundView: 1
   _center:
     _latitude: 47.62051
     _longitude: -122.349303

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

@@ -177,6 +177,8 @@ MonoBehaviour:
   _mapEdgeColor: {r: 0.31468502, g: 0.4076432, b: 0.56700003, a: 1}
   _mapEdgeColorFadeDistance: 0
   _detailOffset: 0
+  _numElevationTileFallbackLods: 2
+  _requestTilesAroundView: 1
   _center:
     _latitude: 47.6205
     _longitude: -122.3493
@@ -799,6 +801,7 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_renderer: {fileID: 1100446394}
   m_maskType: 0
+  _SortingLayer: 0
   _SortingLayerID: 0
   _SortingOrder: 0
 --- !u!222 &1100446392
@@ -974,6 +977,7 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_renderer: {fileID: 1440352932}
   m_maskType: 0
+  _SortingLayer: 0
   _SortingLayerID: 0
   _SortingOrder: 0
 --- !u!222 &1440352930
@@ -1193,6 +1197,7 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_renderer: {fileID: 2058520369}
   m_maskType: 0
+  _SortingLayer: 0
   _SortingLayerID: 0
   _SortingOrder: 0
 --- !u!222 &2058520367

SampleProject/Assets/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f2f691f92809ee448ac71b94a8a77c8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleProject/Assets/Plugins/Android.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 682600c923d39f249b07229a4c27067d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleProject/Assets/Plugins/Android/launcherTemplate.gradle

@@ -0,0 +1,84 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        // Must be Android Gradle Plugin 3.6.0 or later. For a list of
+        // compatible Gradle versions refer to:
+        // https://developer.android.com/studio/releases/gradle-plugin
+        classpath 'com.android.tools.build:gradle:3.6.0'
+    }
+}
+
+allprojects {
+   repositories {
+      google()
+      jcenter()
+      flatDir {
+        dirs 'libs'
+      }
+   }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation project(':unityLibrary')
+    }
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        applicationId '**APPLICATIONID**'
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+    }
+
+    aaptOptions {
+        noCompress = ['.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**]
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**SIGN**
+
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled **MINIFY_DEBUG**
+            useProguard **PROGUARD_DEBUG**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+            jniDebuggable true
+        }
+        release {
+            minifyEnabled **MINIFY_RELEASE**
+            useProguard **PROGUARD_RELEASE**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+        }
+    }**PACKAGING_OPTIONS****SPLITS**
+**BUILT_APK_LOCATION**
+    bundle {
+        language {
+            enableSplit = false
+        }
+        density {
+            enableSplit = false
+        }
+        abi {
+            enableSplit = true
+        }
+    }
+}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**

SampleProject/Assets/Plugins/Android/launcherTemplate.gradle.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0a203fefa1f10f04cab2f1faf5795c19
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleProject/Assets/Plugins/Android/mainTemplate.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        // Must be Android Gradle Plugin 3.6.0 or later. For a list of
+        // compatible Gradle versions refer to:
+        // https://developer.android.com/studio/releases/gradle-plugin
+        classpath 'com.android.tools.build:gradle:3.6.0'
+    }
+}
+
+allprojects {
+   repositories {
+      google()
+      jcenter()
+      flatDir {
+        dirs 'libs'
+      }
+   }
+}
+
+apply plugin: 'com.android.library'
+**APPLY_PLUGINS**
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+**DEPS**}
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    aaptOptions {
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**PACKAGING_OPTIONS**
+}**REPOSITORIES****SOURCE_BUILD_SETUP**
+**EXTERNAL_SOURCES**

SampleProject/Assets/Plugins/Android/mainTemplate.gradle.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1032cd2321e901f41bae859eaa529662
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleProject/Assets/XR/XRGeneralSettings.asset

@@ -29,7 +29,8 @@ MonoBehaviour:
   m_RequiresSettingsUpdate: 0
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
-  m_Loaders: []
+  m_Loaders:
+  - {fileID: 11400000, guid: 4e8bac050de8d3e4c9a90ba69c8f9c96, type: 2}
 --- !u!114 &-378489223812669167
 MonoBehaviour:
   m_ObjectHideFlags: 0

SampleProject/Packages/manifest.json

@@ -17,23 +17,23 @@
     }
   ],
   "dependencies": {
-    "com.microsoft.maps.unity": "0.10.1",
+    "com.microsoft.maps.unity": "0.10.2",
-    "com.microsoft.mixedreality.toolkit.examples": "2.5.1",
+    "com.microsoft.mixedreality.toolkit.examples": "2.6.1",
-    "com.microsoft.mixedreality.toolkit.foundation": "2.5.0",
+    "com.microsoft.mixedreality.toolkit.foundation": "2.6.1",
-    "com.microsoft.mixedreality.toolkit.tools": "2.5.1",
+    "com.microsoft.mixedreality.toolkit.tools": "2.6.1",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ide.rider": "1.1.4",
+    "com.unity.ide.rider": "1.2.1",
     "com.unity.ide.vscode": "1.2.3",
-    "com.unity.multiplayer-hlapi": "1.0.6",
+    "com.unity.multiplayer-hlapi": "1.0.8",
-    "com.unity.test-framework": "1.1.20",
+    "com.unity.test-framework": "1.1.24",
-    "com.unity.textmeshpro": "2.1.1",
+    "com.unity.textmeshpro": "2.1.6",
-    "com.unity.timeline": "1.2.17",
+    "com.unity.timeline": "1.2.18",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.arcore": "2.1.12",
+    "com.unity.xr.arcore": "2.1.18",
-    "com.unity.xr.arfoundation": "2.1.10",
+    "com.unity.xr.arfoundation": "2.1.18",
-    "com.unity.xr.arkit": "2.1.10",
+    "com.unity.xr.arkit": "2.1.18",
-    "com.unity.xr.legacyinputhelpers": "2.1.6",
+    "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.xr.management": "3.2.16",
     "com.unity.xr.openvr.standalone": "2.0.5",
     "com.unity.xr.windowsmr.metro": "4.2.3",

SampleProject/ProjectSettings/EditorBuildSettings.asset

@@ -5,7 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Microsoft.Maps.Unity.Examples/UnityARMapExample/UnityARMapExample.unity
     guid: d94c9c1859f383d4eb2503dde6c282e7
   - enabled: 0
@@ -14,7 +14,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Microsoft.Maps.Unity.Examples/WeatherCubeExample/WeatherCubeExample.unity
     guid: d4d8c08f5ac87df45ac98bdf7482b624
-  - enabled: 1
+  - enabled: 0
     path: Assets/Microsoft.Maps.Unity.Examples/MapServicesExample/MapServiceExample.unity
     guid: d38d849ca281b6c419f19339d512b765
   - enabled: 0

SampleProject/ProjectSettings/GraphicsSettings.asset

@@ -38,6 +38,7 @@ GraphicsSettings:
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

SampleProject/ProjectSettings/PackageManagerSettings.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_ScopedRegistriesSettingsExpanded: 1

SampleProject/ProjectSettings/ProjectSettings.asset

@@ -49,7 +49,7 @@ PlayerSettings:
   defaultScreenHeight: 768
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
-  m_StereoRenderingPath: 2
+  m_StereoRenderingPath: 1
   m_ActiveColorSpace: 0
   m_MTRendering: 1
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
@@ -127,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.10.1
+  bundleVersion: 0.10.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -178,7 +178,7 @@ PlayerSettings:
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
-  stripEngineCode: 1
+  stripEngineCode: 0
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 0
@@ -248,7 +248,7 @@ PlayerSettings:
   clonedFromGUID: 56e7a2d3a00f33d44bdd161b773c35b5
   templatePackageId: com.unity.template.3d@1.0.0
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  AndroidTargetArchitectures: 5
+  AndroidTargetArchitectures: 3
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -446,7 +446,7 @@ PlayerSettings:
     m_Devices:
     - WindowsMR
   - m_BuildTarget: Android
-    m_Enabled: 1
+    m_Enabled: 0
     m_Devices: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
@@ -490,6 +490,7 @@ PlayerSettings:
   switchTitleNames_12: 
   switchTitleNames_13: 
   switchTitleNames_14: 
+  switchTitleNames_15: 
   switchPublisherNames_0: 
   switchPublisherNames_1: 
   switchPublisherNames_2: 
@@ -505,6 +506,7 @@ PlayerSettings:
   switchPublisherNames_12: 
   switchPublisherNames_13: 
   switchPublisherNames_14: 
+  switchPublisherNames_15: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -520,6 +522,7 @@ PlayerSettings:
   switchIcons_12: {fileID: 0}
   switchIcons_13: {fileID: 0}
   switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
   switchSmallIcons_0: {fileID: 0}
   switchSmallIcons_1: {fileID: 0}
   switchSmallIcons_2: {fileID: 0}
@@ -535,6 +538,7 @@ PlayerSettings:
   switchSmallIcons_12: {fileID: 0}
   switchSmallIcons_13: {fileID: 0}
   switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
   switchManualHTML: 
   switchAccessibleURLs: 
   switchLegalInformation: 
@@ -597,6 +601,8 @@ PlayerSettings:
   switchSocketInitializeEnabled: 1
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
+  switchUseMicroSleepForYield: 1
+  switchMicroSleepForYieldTime: 25
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -671,6 +677,31 @@ PlayerSettings:
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
   ps4attribVROutputEnabled: 0
+  ps5ParamFilePath: 
+  ps5VideoOutPixelFormat: 0
+  ps5VideoOutInitialWidth: 1920
+  ps5VideoOutOutputMode: 1
+  ps5BackgroundImagePath: 
+  ps5StartupImagePath: 
+  ps5Pic2Path: 
+  ps5StartupImagesFolder: 
+  ps5IconImagesFolder: 
+  ps5SaveDataImagePath: 
+  ps5SdkOverride: 
+  ps5BGMPath: 
+  ps5ShareOverlayImagePath: 
+  ps5NPConfigZipPath: 
+  ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  ps5UseResolutionFallback: 0
+  ps5UseAudio3dBackend: 0
+  ps5ScriptOptimizationLevel: 2
+  ps5Audio3dVirtualSpeakerCount: 14
+  ps5UpdateReferencePackage: 
+  ps5disableAutoHideSplash: 0
+  ps5OperatingSystemCanDisableSplashScreen: 0
+  ps5IncludedModules: []
+  ps5SharedBinaryContentLabels: []
+  ps5SharedBinarySystemFolders: []
   monoEnv: 
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -693,7 +724,7 @@ PlayerSettings:
   scriptingDefineSymbols:
     1: UNITY_POST_PROCESSING_STACK_V2
     4: UNITY_POST_PROCESSING_STACK_V2;ARFOUNDATION_PRESENT
-    7: UNITY_POST_PROCESSING_STACK_V2;ARFOUNDATION_PRESENT
+    7: ARFOUNDATION_PRESENT
     13: UNITY_POST_PROCESSING_STACK_V2
     14: 
     17: UNITY_POST_PROCESSING_STACK_V2
@@ -707,6 +738,7 @@ PlayerSettings:
     27: UNITY_POST_PROCESSING_STACK_V2
   platformArchitecture: {}
   scriptingBackend:
+    Android: 1
     Metro: 1
     Standalone: 1
   il2cppCompilerConfiguration: {}
@@ -716,8 +748,10 @@ PlayerSettings:
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 0
+  assemblyVersionValidation: 1
   gcWBarrierValidation: 0
-  apiCompatibilityLevelPerPlatform: {}
+  apiCompatibilityLevelPerPlatform:
+    Android: 6
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: MapsSdkSamples

SampleProject/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.16f1
+m_EditorVersion: 2019.4.25f1
-m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e)
+m_EditorVersionWithRevision: 2019.4.25f1 (01a0494af254)

SampleProject/ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 5
+  m_CurrentQuality: 0
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low