mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-19 17:22:37 +08:00
feat: new effect that synchronize with another effect
With UISyncEffect, you can apply the same effect as any other effect component. Close #159, #158, #143
This commit is contained in:
@@ -36,9 +36,15 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Mark the vertices as dirty.
|
||||
/// </summary>
|
||||
protected void SetMaterialDirty()
|
||||
public void SetMaterialDirty()
|
||||
{
|
||||
connector.SetMaterialDirty(graphic);
|
||||
|
||||
foreach (var effect in syncEffects)
|
||||
{
|
||||
effect.SetMaterialDirty();
|
||||
// BaseConnector.FindConnector(effect.graphic).SetMaterialDirty(effect.graphic);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual Hash128 GetMaterialHash(Material baseMaterial)
|
||||
@@ -46,7 +52,12 @@ namespace Coffee.UIExtensions
|
||||
return k_InvalidHash;
|
||||
}
|
||||
|
||||
public virtual Material GetModifiedMaterial(Material baseMaterial)
|
||||
public Material GetModifiedMaterial(Material baseMaterial)
|
||||
{
|
||||
return GetModifiedMaterial(baseMaterial, graphic);
|
||||
}
|
||||
|
||||
public virtual Material GetModifiedMaterial(Material baseMaterial, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled) return baseMaterial;
|
||||
|
||||
@@ -55,7 +66,7 @@ namespace Coffee.UIExtensions
|
||||
var modifiedMaterial = baseMaterial;
|
||||
if (_effectMaterialHash.isValid)
|
||||
{
|
||||
modifiedMaterial = MaterialCache.Register(baseMaterial, _effectMaterialHash, ModifyMaterial);
|
||||
modifiedMaterial = MaterialCache.Register(baseMaterial, _effectMaterialHash, ModifyMaterial, graphic);
|
||||
}
|
||||
|
||||
MaterialCache.Unregister(oldHash);
|
||||
@@ -68,7 +79,7 @@ namespace Coffee.UIExtensions
|
||||
// return material && material.shader && material.shader.name.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal);
|
||||
// }
|
||||
|
||||
public virtual void ModifyMaterial(Material newMaterial)
|
||||
public virtual void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
if (isActiveAndEnabled && paramTex != null)
|
||||
paramTex.RegisterMaterial(newMaterial);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
@@ -41,6 +42,8 @@ namespace Coffee.UIExtensions
|
||||
get { return _rectTransform ? _rectTransform : _rectTransform = GetComponent<RectTransform>(); }
|
||||
}
|
||||
|
||||
internal readonly List<UISyncEffect> syncEffects = new List<UISyncEffect>(0);
|
||||
|
||||
/// <summary>
|
||||
/// The material for rendering.
|
||||
/// </summary>
|
||||
@@ -63,6 +66,11 @@ namespace Coffee.UIExtensions
|
||||
/// </summary>
|
||||
/// <param name="vh">VertexHelper.</param>
|
||||
public virtual void ModifyMesh(VertexHelper vh)
|
||||
{
|
||||
ModifyMesh(vh, graphic);
|
||||
}
|
||||
|
||||
public virtual void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -73,6 +81,11 @@ namespace Coffee.UIExtensions
|
||||
{
|
||||
connector.SetVerticesDirty(graphic);
|
||||
|
||||
foreach (var effect in syncEffects)
|
||||
{
|
||||
effect.SetVerticesDirty();
|
||||
}
|
||||
|
||||
// #if TMP_PRESENT
|
||||
// if (textMeshPro)
|
||||
// {
|
||||
|
||||
@@ -3,6 +3,7 @@ using System.Linq;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using System.Text;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
@@ -39,7 +40,7 @@ namespace Coffee.UIExtensions
|
||||
}
|
||||
#endif
|
||||
|
||||
public static Material Register(Material baseMaterial, Hash128 hash, System.Action<Material> onModifyMaterial)
|
||||
public static Material Register(Material baseMaterial, Hash128 hash, System.Action<Material, Graphic> onModifyMaterial, Graphic graphic)
|
||||
{
|
||||
if (!hash.isValid) return null;
|
||||
|
||||
@@ -54,7 +55,7 @@ namespace Coffee.UIExtensions
|
||||
},
|
||||
};
|
||||
|
||||
onModifyMaterial(entry.material);
|
||||
onModifyMaterial(entry.material, graphic);
|
||||
materialMap.Add(hash, entry);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,13 +21,9 @@ namespace Coffee.UIExtensions.Editors
|
||||
{
|
||||
if (changed)
|
||||
{
|
||||
var graphics = targets.OfType<BaseMaterialEffect>()
|
||||
.Select(x => x.graphic)
|
||||
.Where(x => x);
|
||||
|
||||
foreach (var g in graphics)
|
||||
foreach (var effect in targets.OfType<BaseMaterialEffect>())
|
||||
{
|
||||
BaseConnector.FindConnector(g).SetMaterialDirty(g);
|
||||
effect.SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -136,6 +136,16 @@ namespace Coffee.UIExtensions
|
||||
}
|
||||
}
|
||||
|
||||
private static Texture defaultTransitionTexture
|
||||
{
|
||||
get
|
||||
{
|
||||
return _defaultTransitionTexture
|
||||
? _defaultTransitionTexture
|
||||
: (_defaultTransitionTexture = Resources.Load<Texture>("Default-Transition"));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The area for effect.
|
||||
/// </summary>
|
||||
@@ -201,19 +211,9 @@ namespace Coffee.UIExtensions
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
private static Texture defaultTransitionTexture
|
||||
{
|
||||
get
|
||||
{
|
||||
return _defaultTransitionTexture
|
||||
? _defaultTransitionTexture
|
||||
: (_defaultTransitionTexture = Resources.Load<Texture>("Default-Transition"));
|
||||
}
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial)
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
var connector = BaseConnector.FindConnector(graphic);
|
||||
newMaterial.shader = connector.FindShader("UIDissolve");
|
||||
SetShaderVariants(newMaterial, m_ColorMode);
|
||||
|
||||
@@ -224,7 +224,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
return;
|
||||
|
||||
@@ -207,8 +207,10 @@ namespace Coffee.UIExtensions
|
||||
);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial)
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
var connector = BaseConnector.FindConnector(graphic);
|
||||
|
||||
newMaterial.shader = connector.FindShader("UIEffect");
|
||||
SetShaderVariants(newMaterial, m_EffectMode, m_ColorMode, m_BlurMode,
|
||||
m_AdvancedBlur ? BlurEx.Ex : BlurEx.None);
|
||||
@@ -219,7 +221,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
{
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Dissolve effect for uGUI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
public class UIEffectMaterialResolver : MonoBehaviour, IMaterialModifier, IMeshModifier
|
||||
{
|
||||
[ContextMenu("test")]
|
||||
void test()
|
||||
{
|
||||
GetComponent<Graphic>().SetMaterialDirty();
|
||||
GetComponent<Graphic>().SetVerticesDirty();
|
||||
}
|
||||
|
||||
Hash128 _effectMaterialHash;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the object becomes enabled and active.
|
||||
/// </summary>
|
||||
protected void OnEnable()
|
||||
{
|
||||
//GetComponent<Graphic> ().SetMaterialDirty ();
|
||||
//GetComponent<Graphic> ().SetVerticesDirty ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This function is called when the behaviour becomes disabled () or inactive.
|
||||
/// </summary>
|
||||
protected void OnDisable()
|
||||
{
|
||||
MaterialCache.Unregister(_effectMaterialHash);
|
||||
_effectMaterialHash = new Hash128();
|
||||
|
||||
//GetComponent<Graphic> ().SetMaterialDirty ();
|
||||
//GetComponent<Graphic> ().SetVerticesDirty ();
|
||||
}
|
||||
|
||||
protected Hash128 GetMaterialHash(Material material)
|
||||
{
|
||||
return new Hash128();
|
||||
}
|
||||
|
||||
public Material GetModifiedMaterial(Material baseMaterial)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
{
|
||||
return baseMaterial;
|
||||
}
|
||||
|
||||
var modifier = transform.parent.GetComponent<BaseMaterialEffect>();
|
||||
|
||||
|
||||
var oldHash = _effectMaterialHash;
|
||||
_effectMaterialHash = modifier.GetMaterialHash(baseMaterial);
|
||||
var modifiedMaterial = baseMaterial;
|
||||
if (_effectMaterialHash.isValid)
|
||||
{
|
||||
modifiedMaterial = MaterialCache.Register(baseMaterial, _effectMaterialHash, modifier.ModifyMaterial);
|
||||
}
|
||||
|
||||
MaterialCache.Unregister(oldHash);
|
||||
|
||||
return modifiedMaterial;
|
||||
}
|
||||
|
||||
//public Material GetModifiedMaterial2 (Material baseMaterial)
|
||||
//{
|
||||
// Debug.Log ("UIEffectMaterialResolver 0");
|
||||
// if (!isActiveAndEnabled)
|
||||
// return baseMaterial;
|
||||
|
||||
// var parent = transform.parent;
|
||||
// if (!parent)
|
||||
// return baseMaterial;
|
||||
|
||||
// var modifier = parent.GetComponent<UIEffectBase> ();
|
||||
// if (modifier == null)
|
||||
// {
|
||||
// Debug.Log ("UIEffectMaterialResolver modifier is null");
|
||||
// return baseMaterial;
|
||||
// }
|
||||
|
||||
// Debug.Log ("UIEffectMaterialResolver !!! " + modifier);
|
||||
// return modifier.GetModifiedMaterial (baseMaterial);
|
||||
//}
|
||||
|
||||
public void ModifyMesh(Mesh mesh)
|
||||
{
|
||||
}
|
||||
|
||||
public void ModifyMesh(VertexHelper verts)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var modifier = transform.parent.GetComponent<BaseMaterialEffect>();
|
||||
modifier.ModifyMesh(verts);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,7 +49,7 @@ namespace Coffee.UIExtensions
|
||||
/// Call used to modify mesh.
|
||||
/// </summary>
|
||||
/// <param name="vh">VertexHelper.</param>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled) return;
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Call used to modify mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
return;
|
||||
|
||||
@@ -125,13 +125,15 @@ namespace Coffee.UIExtensions
|
||||
);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial)
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
var connector = BaseConnector.FindConnector(graphic);
|
||||
|
||||
newMaterial.shader = connector.FindShader("UIHsvModifier");
|
||||
paramTex.RegisterMaterial(newMaterial);
|
||||
}
|
||||
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
return;
|
||||
|
||||
@@ -181,7 +181,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled || vh.currentVertCount <= 0 || m_Style == ShadowStyle.None)
|
||||
{
|
||||
|
||||
@@ -185,8 +185,10 @@ namespace Coffee.UIExtensions
|
||||
);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial)
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
var connector = BaseConnector.FindConnector(graphic);
|
||||
|
||||
newMaterial.shader = connector.FindShader("UIShiny");
|
||||
paramTex.RegisterMaterial(newMaterial);
|
||||
}
|
||||
@@ -194,7 +196,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
|
||||
namespace Coffee.UIExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Dissolve effect for uGUI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
public class UISyncEffect : BaseMaterialEffect
|
||||
{
|
||||
[Tooltip("The target effect to synchronize.")] [SerializeField]
|
||||
private BaseMeshEffect m_TargetEffect;
|
||||
|
||||
public BaseMeshEffect targetEffect
|
||||
{
|
||||
get { return m_TargetEffect != this ? m_TargetEffect : null; }
|
||||
set
|
||||
{
|
||||
if (m_TargetEffect == value) return;
|
||||
m_TargetEffect = value;
|
||||
|
||||
SetVerticesDirty();
|
||||
SetMaterialDirty();
|
||||
SetEffectParamsDirty();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnEnable()
|
||||
{
|
||||
if (targetEffect)
|
||||
targetEffect.syncEffects.Add(this);
|
||||
base.OnEnable();
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
{
|
||||
if (targetEffect)
|
||||
targetEffect.syncEffects.Remove(this);
|
||||
base.OnDisable();
|
||||
}
|
||||
|
||||
public override Hash128 GetMaterialHash(Material baseMaterial)
|
||||
{
|
||||
if (!isActiveAndEnabled) return k_InvalidHash;
|
||||
|
||||
var matEffect = targetEffect as BaseMaterialEffect;
|
||||
if (!matEffect || !matEffect.isActiveAndEnabled) return k_InvalidHash;
|
||||
|
||||
return matEffect.GetMaterialHash(baseMaterial);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled) return;
|
||||
|
||||
var matEffect = targetEffect as BaseMaterialEffect;
|
||||
if (!matEffect || !matEffect.isActiveAndEnabled) return;
|
||||
|
||||
matEffect.ModifyMaterial(newMaterial, graphic);
|
||||
}
|
||||
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled) return;
|
||||
if (!targetEffect || !targetEffect.isActiveAndEnabled) return;
|
||||
|
||||
targetEffect.ModifyMesh(vh, graphic);
|
||||
}
|
||||
|
||||
protected override void OnValidate()
|
||||
{
|
||||
SetVerticesDirty();
|
||||
SetMaterialDirty();
|
||||
SetEffectParamsDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -226,8 +226,9 @@ namespace Coffee.UIExtensions
|
||||
);
|
||||
}
|
||||
|
||||
public override void ModifyMaterial(Material newMaterial)
|
||||
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
|
||||
{
|
||||
var connector = BaseConnector.FindConnector(graphic);
|
||||
newMaterial.shader = connector.FindShader("UITransition");
|
||||
SetShaderVariants(newMaterial, m_EffectMode);
|
||||
|
||||
@@ -238,7 +239,7 @@ namespace Coffee.UIExtensions
|
||||
/// <summary>
|
||||
/// Modifies the mesh.
|
||||
/// </summary>
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
public override void ModifyMesh(VertexHelper vh, Graphic graphic)
|
||||
{
|
||||
if (!isActiveAndEnabled)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user