mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-21 10:22:37 +08:00
HSV modifier for v4
This commit is contained in:
@@ -22,16 +22,11 @@ namespace Coffee.UIExtensions.Editors
|
||||
{
|
||||
base.OnEnable ();
|
||||
|
||||
_spMaterial = serializedObject.FindProperty("m_EffectMaterial");
|
||||
_spTargetColor = serializedObject.FindProperty("m_TargetColor");
|
||||
_spRange = serializedObject.FindProperty("m_Range");
|
||||
_spHue = serializedObject.FindProperty("m_Hue");
|
||||
_spSaturation = serializedObject.FindProperty("m_Saturation");
|
||||
_spValue = serializedObject.FindProperty("m_Value");
|
||||
|
||||
_shader = Shader.Find ("TextMeshPro/Distance Field (UIHsvModifier)");
|
||||
_mobileShader = Shader.Find ("TextMeshPro/Mobile/Distance Field (UIHsvModifier)");
|
||||
_spriteShader = Shader.Find ("TextMeshPro/Sprite (UIHsvModifier)");
|
||||
}
|
||||
|
||||
|
||||
@@ -42,13 +37,6 @@ namespace Coffee.UIExtensions.Editors
|
||||
{
|
||||
serializedObject.Update();
|
||||
|
||||
//================
|
||||
// Effect material.
|
||||
//================
|
||||
EditorGUI.BeginDisabledGroup(true);
|
||||
EditorGUILayout.PropertyField(_spMaterial);
|
||||
EditorGUI.EndDisabledGroup();
|
||||
|
||||
//================
|
||||
// Effect setting.
|
||||
//================
|
||||
@@ -58,27 +46,18 @@ namespace Coffee.UIExtensions.Editors
|
||||
EditorGUILayout.PropertyField(_spSaturation);
|
||||
EditorGUILayout.PropertyField(_spValue);
|
||||
|
||||
var c = target as UIHsvModifier;
|
||||
c.ShowTMProWarning (_shader, _mobileShader, _spriteShader, mat => {});
|
||||
ShowCanvasChannelsWarning ();
|
||||
|
||||
ShowMaterialEditors (c.materials, 1, c.materials.Length - 1);
|
||||
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
}
|
||||
|
||||
//################################
|
||||
// Private Members.
|
||||
//################################
|
||||
SerializedProperty _spMaterial;
|
||||
SerializedProperty _spTargetColor;
|
||||
SerializedProperty _spRange;
|
||||
SerializedProperty _spHue;
|
||||
SerializedProperty _spSaturation;
|
||||
SerializedProperty _spValue;
|
||||
|
||||
Shader _shader;
|
||||
Shader _mobileShader;
|
||||
Shader _spriteShader;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
using UnityEngine.UI;
|
||||
|
||||
@@ -134,14 +135,67 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
public override ParameterTexture ptex { get { return _ptex; } }
|
||||
|
||||
public override Hash128 GetMaterialHash (Material material)
|
||||
{
|
||||
if (!isActiveAndEnabled || !material || !material.shader)
|
||||
return new Hash128 ();
|
||||
|
||||
uint materialId = (uint)material.GetInstanceID ();
|
||||
uint shaderId = 6 << 3;
|
||||
|
||||
string materialShaderName = material.shader.name;
|
||||
if (materialShaderName.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal))
|
||||
{
|
||||
shaderId += 2;
|
||||
}
|
||||
else if (materialShaderName.Equals ("TextMeshPro/Sprite", StringComparison.Ordinal))
|
||||
{
|
||||
shaderId += 0;
|
||||
}
|
||||
else if (materialShaderName.StartsWith ("TextMeshPro/", StringComparison.Ordinal))
|
||||
{
|
||||
shaderId += 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
shaderId += 0;
|
||||
}
|
||||
|
||||
return new Hash128 (
|
||||
materialId,
|
||||
shaderId,
|
||||
0,
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial (Material material)
|
||||
{
|
||||
string materialShaderName = material.shader.name;
|
||||
if (materialShaderName.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal))
|
||||
{
|
||||
material.shader = Shader.Find ("TextMeshPro/Mobile/Distance Field (UIHsvModifier)");
|
||||
}
|
||||
else if (materialShaderName.Equals ("TextMeshPro/Sprite", StringComparison.Ordinal))
|
||||
{
|
||||
material.shader = Shader.Find ("UI/Hidden/UI-Effect-HSV");
|
||||
}
|
||||
else if (materialShaderName.StartsWith ("TextMeshPro/", StringComparison.Ordinal))
|
||||
{
|
||||
material.shader = Shader.Find ("TextMeshPro/Distance Field (UIHsvModifier)");
|
||||
}
|
||||
else
|
||||
{
|
||||
material.shader = Shader.Find ("UI/Hidden/UI-Effect-HSV");
|
||||
}
|
||||
|
||||
ptex.RegisterMaterial (material);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
protected override Material GetMaterial()
|
||||
{
|
||||
if (isTMPro)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return MaterialResolver.GetOrGenerateMaterialVariant(Shader.Find(shaderName));
|
||||
return null;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -173,11 +227,6 @@ namespace Coffee.UIExtensions
|
||||
float h, s, v;
|
||||
Color.RGBToHSV(m_TargetColor, out h, out s, out v);
|
||||
|
||||
foreach (var m in materials)
|
||||
{
|
||||
ptex.RegisterMaterial (m);
|
||||
}
|
||||
|
||||
ptex.SetData(this, 0, h); // param1.x : target hue
|
||||
ptex.SetData(this, 1, s); // param1.y : target saturation
|
||||
ptex.SetData(this, 2, v); // param1.z : target value
|
||||
|
||||
Reference in New Issue
Block a user