added instancing to shaders.

Author: killerantz

Assets/HoloToolkit-Examples/InteractiveElements/Scenes/InteractiveButtonComponents.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 8
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -25,6 +25,7 @@ RenderSettings:
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 0
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
   m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
@@ -41,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -53,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 4
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -66,13 +67,27 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVRFiltering: 0
+    m_PVRFilteringMode: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousColorSigma: 1
+    m_PVRFilteringAtrousNormalSigma: 1
+    m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_RuntimeCPUUsage: 25
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -89,6 +104,8 @@ NavMeshSettings:
     minRegionArea: 2
     manualCellSize: 0
     cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1001 &138317576
@@ -559,7 +576,7 @@ Light:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1829727920}
   m_Enabled: 1
-  serializedVersion: 7
+  serializedVersion: 8
   m_Type: 1
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
@@ -584,6 +601,8 @@ Light:
   m_Lightmapping: 4
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
 --- !u!4 &1829727922

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

@@ -24,6 +24,7 @@ Shader "HoloToolkit/UnlitTransparentTriplanar"
 			CGPROGRAM
 			#pragma vertex vert
 			#pragma fragment frag
+			#pragma multi_compile_instancing
 			#include "UnityCG.cginc"
 
 			struct appdata
@@ -45,9 +46,12 @@ Shader "HoloToolkit/UnlitTransparentTriplanar"
 
 			fixed _Ambient;
 			fixed3 _LightDir;
-			fixed4 _Color;
 			float1 _LightIntensity;
 			float1 _CameraIntensity;
+			UNITY_INSTANCING_CBUFFER_START(Props)
+				UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
+			UNITY_INSTANCING_CBUFFER_END
+
 
 			v2f vert(float4 pos : POSITION, float3 normal : NORMAL, appdata v)
 			{
@@ -73,7 +77,7 @@ Shader "HoloToolkit/UnlitTransparentTriplanar"
 			{
 				UNITY_SETUP_INSTANCE_ID(i);
 				// Return the color with the diffuse color.
-				return _Color * fixed4(i.diffuse, 1.0);
+				return UNITY_ACCESS_INSTANCED_PROP(_Color) * fixed4(i.diffuse, 1.0);
 			}
 			ENDCG
 		}

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

@@ -24,6 +24,7 @@ Shader "HoloToolkit/UnlitTriplanar"
 			CGPROGRAM
 			#pragma vertex vert
 			#pragma fragment frag
+			#pragma multi_compile_instancing
 			#include "UnityCG.cginc"
 
 			struct appdata
@@ -45,9 +46,12 @@ Shader "HoloToolkit/UnlitTriplanar"
 
 			fixed _Ambient;
 			fixed3 _LightDir;
-			fixed4 _Color;
 			float1 _LightIntensity;
 			float1 _CameraIntensity;
+			UNITY_INSTANCING_CBUFFER_START(Props)
+				UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
+			UNITY_INSTANCING_CBUFFER_END
+
 
 			v2f vert(float4 pos : POSITION, float3 normal : NORMAL, appdata v)
 			{
@@ -73,7 +77,7 @@ Shader "HoloToolkit/UnlitTriplanar"
 			{
 				UNITY_SETUP_INSTANCE_ID(i);
 				// Return the color with the diffuse color.
-				return _Color * fixed4(i.diffuse, 1.0);
+				return  UNITY_ACCESS_INSTANCED_PROP(_Color) * fixed4(i.diffuse, 1.0);
 			}
 			ENDCG
 		}

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

@@ -50,6 +50,7 @@ Shader "HoloToolkit/3DTextShader"
             CGPROGRAM
                 #pragma vertex vert
                 #pragma fragment frag
+				#pragma multi_compile_instancing
                 #include "UnityCG.cginc"
 
                 struct appdata_t
@@ -72,7 +73,9 @@ Shader "HoloToolkit/3DTextShader"
 
                 sampler2D _MainTex;
                 float4 _MainTex_ST;
-                fixed4 _Color;
+				UNITY_INSTANCING_CBUFFER_START(Props)
+					UNITY_DEFINE_INSTANCED_PROP(fixed4, _Color)
+				UNITY_INSTANCING_CBUFFER_END
 
                 v2f vert (appdata_t v)
                 {
@@ -94,7 +97,7 @@ Shader "HoloToolkit/3DTextShader"
 					UNITY_SETUP_INSTANCE_ID(i);
                     half4 col = i.color;
                     col.a *= tex2D(_MainTex, i.texcoord).a;
-                    col = col * _Color;
+                    col = col * UNITY_ACCESS_INSTANCED_PROP(_Color);
                     clip (col.a - 0.01);
                     return col;
                 }