fixed formatting, removed upgrade comments, added standard license lines and move Example shaders to the proper namespace.

Author: killerantz

Assets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTransparentTriplanar.shader

@@ -1,6 +1,10 @@
-// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 
-Shader "HoloToolkit/UnlitTransparentTriplanar"
+///
+/// Simple vertex shader that blends static lighting and camera lighting.
+///
+Shader "HoloToolkit/Examples/UnlitTransparentTriplanar"
 {
 	Properties
 	{

Assets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTriplanar.shader

@@ -1,12 +1,10 @@
-// Upgrade NOTE: replaced 'UNITY_INSTANCE_ID' with 'UNITY_VERTEX_INPUT_INSTANCE_ID'
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 
-// Upgrade NOTE: replaced 'UNITY_INSTANCE_ID' with 'UNITY_VERTEX_INPUT_INSTANCE_ID'
-
-// Upgrade NOTE: replaced 'UNITY_INSTANCE_ID' with 'UNITY_VERTEX_INPUT_INSTANCE_ID'
-
-// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
-
-Shader "HoloToolkit/UnlitTriplanar"
+///
+///  Simple vertex shader that blends static lighting and camera lighting.
+///
+Shader "HoloToolkit/Examples/UnlitTriplanar"
 {
 	Properties
 	{

Assets/HoloToolkit/UI/Shaders/3DTextShader.shader

@@ -1,5 +1,9 @@
-// Upgrade NOTE: replaced 'UNITY_INSTANCE_ID' with 'UNITY_VERTEX_INPUT_INSTANCE_ID'
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
 
+///
+/// Basic 3D Text shader with proper z-shorting
+///
 Shader "HoloToolkit/3DTextShader"
 {
     Properties
@@ -48,59 +52,59 @@ Shader "HoloToolkit/3DTextShader"
         Pass
         {
             CGPROGRAM
-                #pragma vertex vert
-                #pragma fragment frag
-				#pragma multi_compile_instancing
-                #include "UnityCG.cginc"
+            #pragma vertex vert
+            #pragma fragment frag
+			#pragma multi_compile_instancing
+            #include "UnityCG.cginc"
 
-                struct appdata_t
-                {
-                    float4 vertex : POSITION;
-                    half4 color : COLOR;
-                    float2 texcoord : TEXCOORD0;
-					UNITY_VERTEX_INPUT_INSTANCE_ID
-                };
+            struct appdata_t
+            {
+                float4 vertex : POSITION;
+                half4 color : COLOR;
+                float2 texcoord : TEXCOORD0;
+				UNITY_VERTEX_INPUT_INSTANCE_ID
+            };
 
-                struct v2f
-                {
-                    float4 vertex : POSITION;
-                    half4 color : COLOR;
-                    float2 texcoord : TEXCOORD0;
-					UNITY_VERTEX_INPUT_INSTANCE_ID
-					UNITY_VERTEX_OUTPUT_STEREO
+            struct v2f
+            {
+                float4 vertex : POSITION;
+                half4 color : COLOR;
+                float2 texcoord : TEXCOORD0;
+				UNITY_VERTEX_INPUT_INSTANCE_ID
+				UNITY_VERTEX_OUTPUT_STEREO
 
-                };
+            };
 
-                sampler2D _MainTex;
-                float4 _MainTex_ST;
-				UNITY_INSTANCING_CBUFFER_START(Props)
-					UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
-				UNITY_INSTANCING_CBUFFER_END
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+			UNITY_INSTANCING_CBUFFER_START(Props)
+				UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
+			UNITY_INSTANCING_CBUFFER_END
 
-                v2f vert (appdata_t v)
-                {
-					v2f o;
-					UNITY_SETUP_INSTANCE_ID(v);
-					UNITY_TRANSFER_INSTANCE_ID(v, o);
-					UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
-                    o.vertex = UnityObjectToClipPos(v.vertex);
-                    o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
-                    o.color = v.color;
-                    #ifdef UNITY_HALF_TEXEL_OFFSET
-                    o.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
-                    #endif
-                    return o;
-                }
+            v2f vert (appdata_t v)
+            {
+				v2f o;
+				UNITY_SETUP_INSTANCE_ID(v);
+				UNITY_TRANSFER_INSTANCE_ID(v, o);
+				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
+                o.color = v.color;
+                #ifdef UNITY_HALF_TEXEL_OFFSET
+                o.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
+                #endif
+                return o;
+            }
 
-                half4 frag (v2f i) : COLOR
-                {
-					UNITY_SETUP_INSTANCE_ID(i);
-                    half4 col = i.color;
-                    col.a *= tex2D(_MainTex, i.texcoord).a;
-                    col = col * UNITY_ACCESS_INSTANCED_PROP(_Color);
-                    clip (col.a - 0.01);
-                    return col;
-                }
+            half4 frag (v2f i) : COLOR
+            {
+				UNITY_SETUP_INSTANCE_ID(i);
+                half4 col = i.color;
+                col.a *= tex2D(_MainTex, i.texcoord).a;
+                col = col * UNITY_ACCESS_INSTANCED_PROP(_Color);
+                clip (col.a - 0.01);
+                return col;
+            }
             ENDCG
         }
     }