Changed: UIEffect inherit BaseMeshEffect.

This commit is contained in:
Takashi Sakai
2018-01-18 11:01:47 +09:00
parent 3217c7f015
commit 79f8e34c3c
3 changed files with 13 additions and 81 deletions
-20
View File
@@ -40,26 +40,6 @@ fixed4 UnpackToVec4(float value)
return color;
}
// Unpack float to low-precision [0-1] half3.
// The z value is a little high precision.
half3 UnpackToVec3(float value)
{
const int PRECISION = PACKER_STEP - 1;
const int PACKER_STEP_HIGH = PACKER_STEP * PACKER_STEP;
const int PRECISION_HIGH = PACKER_STEP_HIGH - 1;
half3 color;
color.x = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.y = (value % PACKER_STEP) / PRECISION;
value = floor(value / PACKER_STEP);
color.z = (value % PACKER_STEP_HIGH) / (PRECISION_HIGH - 1);
return color;
}
//################################
// Blur effect
//################################
+1 -1
View File
@@ -131,7 +131,7 @@ Shader "UI/Hidden/UI-Effect"
// vvvv [For UIEffect] vvvv : Calculate effect parameter.
#if defined (UI_TONE) || defined (UI_BLUR)
OUT.effectFactor = UnpackToVec3(IN.uv1.x);
OUT.effectFactor = UnpackToVec4(IN.uv1.x);
#endif
#if UI_TONE_HUE
+12 -60
View File
@@ -16,7 +16,7 @@ namespace UnityEngine.UI
[ExecuteInEditMode]
[RequireComponent(typeof(Graphic))]
[DisallowMultipleComponent]
public class UIEffect : MonoBehaviour, IMeshModifier
public class UIEffect : BaseMeshEffect
#if UNITY_EDITOR
, ISerializationCallbackReceiver
#endif
@@ -228,12 +228,6 @@ namespace UnityEngine.UI
[SerializeField] Material m_EffectMaterial;
/// <summary>
/// Graphic affected by the UIEffect.
/// </summary>
public Graphic graphic { get { if (m_Graphic == null) m_Graphic = GetComponent<Graphic>(); return m_Graphic; } }
Graphic m_Graphic;
/// <summary>
/// Additional Shadows.
@@ -249,32 +243,25 @@ namespace UnityEngine.UI
/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
protected virtual void OnEnable()
protected override void OnEnable()
{
SetDirty(true);
graphic.material = effectMaterial;
base.OnEnable();
}
/// <summary>
/// This function is called when the behaviour becomes disabled () or inactive.
/// </summary>
protected virtual void OnDisable()
protected override void OnDisable()
{
graphic.material = null;
SetDirty();
}
/// <summary>
/// Callback for when properties have been changed by animation.
/// </summary>
protected virtual void OnDidApplyAnimationProperties()
{
SetDirty(true);
base.OnDisable();
}
/// <summary>
/// Modifies the mesh.
/// </summary>
public virtual void ModifyMesh(VertexHelper vh)
public override void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled)
{
@@ -290,7 +277,7 @@ namespace UnityEngine.UI
{
// Pack some effect factors to 1 float.
Vector2 factor = new Vector2(
PackToFloat(toneLevel, 0, blur),
PackToFloat(toneLevel, 0, blur, 0),
PackToFloat(effectColor.r, effectColor.g, effectColor.b, effectColor.a)
);
@@ -329,22 +316,7 @@ namespace UnityEngine.UI
s_Verts.Clear();
}
/// <summary>
/// Modifies the mesh.
/// </summary>
[System.Obsolete("use IMeshModifier.ModifyMesh (VertexHelper verts) instead")]
public void ModifyMesh(Mesh mesh)
{
}
#if UNITY_EDITOR
/// <summary>
/// This function is called when the script is loaded or a value is changed in the inspector (Called in the editor only).
/// </summary>
protected virtual void OnValidate()
{
SetDirty(true);
}
public void OnBeforeSerialize()
{
@@ -398,7 +370,7 @@ namespace UnityEngine.UI
return;
var factor = new Vector2(
PackToFloat(toneLevel, 0, blur),
PackToFloat(toneLevel, 0, blur, 0),
PackToFloat(color.r, color.g, color.b, 1)
);
@@ -472,15 +444,10 @@ namespace UnityEngine.UI
/// <summary>
/// Mark the UIEffect as dirty.
/// </summary>
/// <param name="isMaterialDirty">If set to true material dirty.</param>
void SetDirty(bool isMaterialDirty = false)
void SetDirty()
{
// Update material if needed.
if (isMaterialDirty)
{
graphic.material = effectMaterial;
}
graphic.SetVerticesDirty();
if(graphic)
graphic.SetVerticesDirty();
}
/// <summary>
@@ -495,20 +462,5 @@ namespace UnityEngine.UI
+ (Mathf.FloorToInt(y * PRECISION) << 6)
+ Mathf.FloorToInt(x * PRECISION);
}
/// <summary>
/// Pack 3 low-precision [0-1] floats values to a float.
/// The x and y values [0-1] have 64 steps(6 bits).
/// The z value [0-1] is a little high precision(12 bits).
/// </summary>
static float PackToFloat(float x, float y, float z)
{
const int PRECISION = (1 << 6) - 1;
const int PRECISION_HIGH = (1 << 12) - 1;
return (Mathf.FloorToInt(z * PRECISION_HIGH) << 12)
+ (Mathf.FloorToInt(y * PRECISION) << 6)
+ Mathf.FloorToInt(x * PRECISION);
}
}
}