Merge pull request #485 from HodgsonSDAS/HTK-Batching2

Minor fixes to Editor Hands

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/Editor.meta

@@ -0,0 +1,15 @@
+using UnityEditor;
+
+public class EditorHandsMaterialInspector : ShaderGUI
+{
+    public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
+    {
+        foreach (MaterialProperty materialProperty in properties)
+        {
+            if (materialProperty.flags != MaterialProperty.PropFlags.PerRendererData)
+            {
+                materialEditor.ShaderProperty(materialProperty, materialProperty.displayName);
+            }
+        }
+    }
+}

Assets/HoloToolkit/Input/Scripts/Editor/EditorHandsMaterialInspector.cs

@@ -270,8 +270,8 @@ private void Update()
 
         private void UpdateHandVisualization()
         {
-            leftHandVisualRenderer.material.SetColor("_Color", LeftHandInView ? ActiveHandColor : DroppedHandColor);
-            rightHandVisualRenderer.material.SetColor("_Color", RightHandInView ? ActiveHandColor : DroppedHandColor);
+            leftHandVisualPropertyBlock.SetColor("_Color", LeftHandInView ? ActiveHandColor : DroppedHandColor);
+            rightHandVisualPropertyBlock.SetColor("_Color", RightHandInView ? ActiveHandColor : DroppedHandColor);
 
             if (LeftHandVisualizer.activeSelf != VisualizeHands)
             {

Assets/HoloToolkit/Input/Scripts/Editor/EditorHandsMaterialInspector.cs.meta

@@ -1,96 +1,93 @@
 Shader "HoloToolkit/EditorHands"
 {
-	Properties
-	{
-		[PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
-		_Color ("Tint", Color) = (1,1,1,1)
-		
-		_StencilComp ("Stencil Comparison", Float) = 8
-		_Stencil ("Stencil ID", Float) = 0
-		_StencilOp ("Stencil Operation", Float) = 0
-		_StencilWriteMask ("Stencil Write Mask", Float) = 255
-		_StencilReadMask ("Stencil Read Mask", Float) = 255
+    Properties
+    {
+        [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
+        [PerRendererData] _Color ("Tint", Color) = (1,1,1,1)
+        
+        _StencilComp ("Stencil Comparison", Float) = 8
+        _Stencil ("Stencil ID", Float) = 0
+        _StencilOp ("Stencil Operation", Float) = 0
+        _StencilWriteMask ("Stencil Write Mask", Float) = 255
+        _StencilReadMask ("Stencil Read Mask", Float) = 255
 
-		_ColorMask ("Color Mask", Float) = 15
-	}
+        _ColorMask ("Color Mask", Float) = 15
+    }
 
-	SubShader
-	{
-		Tags
-		{ 
-			"Queue"="Transparent" 
-			"IgnoreProjector"="True" 
-			"RenderType"="Transparent" 
-			"PreviewType"="Plane"
-			"CanUseSpriteAtlas"="True"
-		}
-		
-		Stencil
-		{
-			Ref [_Stencil]
-			Comp [_StencilComp]
-			Pass [_StencilOp] 
-			ReadMask [_StencilReadMask]
-			WriteMask [_StencilWriteMask]
-		}
+    SubShader
+    {
+        Tags
+        {
+            "Queue"="Transparent" 
+            "IgnoreProjector"="True" 
+            "RenderType"="Transparent" 
+            "PreviewType"="Plane"
+            "CanUseSpriteAtlas"="True"
+        }
+        
+        Stencil
+        {
+            Ref [_Stencil]
+            Comp [_StencilComp]
+            Pass [_StencilOp] 
+            ReadMask [_StencilReadMask]
+            WriteMask [_StencilWriteMask]
+        }
 
-		Cull Off
-		Lighting Off
-		ZWrite Off
-		ZTest [unity_GUIZTestMode]
-		Blend SrcAlpha OneMinusSrcAlpha
-		ColorMask [_ColorMask]
+        Cull Off
+        Lighting Off
+        ZWrite Off
+        ZTest [unity_GUIZTestMode]
+        Blend SrcAlpha OneMinusSrcAlpha
+        ColorMask [_ColorMask]
 
-		Pass
-		{
-		CGPROGRAM
-			#pragma vertex vert
-			#pragma fragment frag
-			#include "UnityCG.cginc"
-			
-			struct appdata_t
-			{
-				float4 vertex   : POSITION;
-				float4 color    : COLOR;
-				float2 texcoord : TEXCOORD0;
-				UNITY_VERTEX_INPUT_INSTANCE_ID
-			};
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+            
+            struct appdata_t
+            {
+                float4 vertex   : POSITION;
+                float4 color    : COLOR;
+                float2 texcoord : TEXCOORD0;
+                UNITY_VERTEX_INPUT_INSTANCE_ID
+            };
+            struct v2f
+            {
+                float4 vertex   : SV_POSITION;
+                fixed4 color    : COLOR;
+                half2 texcoord  : TEXCOORD0;
+                UNITY_VERTEX_OUTPUT_STEREO
+            };
+            fixed4 _Color;
+            v2f vert(appdata_t IN)
+            {
+                UNITY_SETUP_INSTANCE_ID(IN);
+                v2f OUT;
+                OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
+                OUT.texcoord = IN.texcoord;
+                #ifdef UNITY_HALF_TEXEL_OFFSET
+                OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
+                #endif
+                OUT.color = IN.color * _Color;
+                UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+                return OUT;
+            }
 
-			struct v2f
-			{
-				float4 vertex   : SV_POSITION;
-				fixed4 color    : COLOR;
-				half2 texcoord  : TEXCOORD0;
-				UNITY_VERTEX_OUTPUT_STEREO
-			};
-			
-			fixed4 _Color;
 
-			v2f vert(appdata_t IN)
-			{
-				UNITY_SETUP_INSTANCE_ID(IN);
+            sampler2D _MainTex;
+            fixed4 frag(v2f IN) : SV_Target
+            {
+                half4 color = tex2D(_MainTex, IN.texcoord) * IN.color;
+                clip (color.a - 0.01);
+                return color;
+            }
 
-				v2f OUT;
-				OUT.vertex = mul(UNITY_MATRIX_MVP, IN.vertex);
-				OUT.texcoord = IN.texcoord;
-#ifdef UNITY_HALF_TEXEL_OFFSET
-				OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
-#endif
-				OUT.color = IN.color * _Color;
-
-				UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
-				return OUT;
-			}
-
-			sampler2D _MainTex;
-
-			fixed4 frag(v2f IN) : SV_Target
-			{
-				half4 color = tex2D(_MainTex, IN.texcoord) * IN.color;
-				clip (color.a - 0.01);
-				return color;
-			}
-		ENDCG
-		}
-	}
+        ENDCG
+        }
+    }
+    CustomEditor "EditorHandsMaterialInspector"
 }