[WIP]Change: Color effect use vertex color to reduce parameters. #50

mob-sakai · Apr 11, 2018 · 577a543 · 577a543
1 parent 81ba1f4
commit 577a543
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Assets/UIEffect/Editor/UIEffectEditor.cs b/Assets/UIEffect/Editor/UIEffectEditor.cs
@@ -57,7 +57,7 @@ public static void DrawEffectProperties(string shaderName, SerializedObject seri
 			if (spColorMode.intValue != (int)UIEffect.ColorMode.None)
 			{
 				EditorGUI.indentLevel++;
-				EditorGUILayout.PropertyField(serializedObject.FindProperty("m_EffectColor"));
+				EditorGUILayout.PropertyField(serializedObject.FindProperty("m_ColorFactor"));
 				EditorGUI.indentLevel--;
 			}
 

diff --git a/Assets/UIEffect/UI-Effect.shader b/Assets/UIEffect/UI-Effect.shader
@@ -153,7 +153,7 @@ Shader "UI/Hidden/UI-Effect"
 				color = ApplyToneEffect(color, IN.effectFactor.x);
 				#endif
 
-				color = ApplyColorEffect(color, fixed4(IN.color.rgb, IN.colorFactor.a));
+				color = ApplyColorEffect(color, fixed4(IN.color.rgb, IN.effectFactor.y));
 				color.a *= IN.color.a;
 
 				return color;

diff --git a/Assets/UIEffect/UIEffect.cs b/Assets/UIEffect/UIEffect.cs
@@ -113,6 +113,7 @@ public enum BlurMode
 		// Serialize Members.
 		//################################
 		[SerializeField][Range(0, 1)] float m_ToneLevel = 1;
+		[SerializeField][Range(0, 1)] float m_ColorFactor = 1;
 		[SerializeField][Range(0, 1)] float m_Blur = 0.25f;
 		[SerializeField][Range(0, 1)] float m_ShadowBlur = 0.25f;
 		[SerializeField] ShadowStyle m_ShadowStyle;
@@ -143,6 +144,12 @@ public enum BlurMode
 		/// </summary>
 		public float toneLevel{ get { return m_ToneLevel; } set { m_ToneLevel = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
 
+		/// <summary>
+		/// Color effect factor, between 0(no effect) and 1(complete effect).
+		/// </summary>
+		public float colorFactor { get { return m_ColorFactor; } set { m_ColorFactor = Mathf.Clamp(value, 0, 1); _SetDirty(); } }
+
+
 		/// <summary>
 		/// How far is the blurring from the graphic.
 		/// </summary>
@@ -245,7 +252,7 @@ public override void ModifyMesh(VertexHelper vh)
 			{
 				// Pack some effect factors to 1 float.
 				Vector2 factor = new Vector2(
-									m_CustomEffect ? _PackToFloat(m_CustomFactor) : _PackToFloat(toneLevel, 0, blur, 0),
+									m_CustomEffect ? _PackToFloat(m_CustomFactor) : _PackToFloat(toneLevel, colorFactor, blur, 0),
 									_PackToFloat(effectColor.r, effectColor.g, effectColor.b, effectColor.a)
 								 );
 
@@ -409,7 +416,7 @@ void _ApplyShadow(List<UIVertex> verts, ref int start, ref int end, ShadowStyle
 				return;
 
 			var factor = new Vector2(
-							 _PackToFloat(toneLevel, 0, blur, 0),
+							 _PackToFloat(toneLevel, 1, blur, 0),
 							 _PackToFloat(color.r, color.g, color.b, 1)
 						 );