diff --git a/Packages/UIEffect/Resources/UIDissolve.shader b/Packages/UIEffect/Resources/UIDissolve.shader
index f540e99..1f48a1d 100644
--- a/Packages/UIEffect/Resources/UIDissolve.shader
+++ b/Packages/UIEffect/Resources/UIDissolve.shader
@@ -1,4 +1,4 @@
-Shader "Hidden/UIDissolve"
+Shader "Hidden/UI/Default (UIDissolve)"
{
Properties
{
diff --git a/Packages/UIEffect/Resources/UIEffect.shader b/Packages/UIEffect/Resources/UIEffect.shader
index c40ae9c..3397a0f 100644
--- a/Packages/UIEffect/Resources/UIEffect.shader
+++ b/Packages/UIEffect/Resources/UIEffect.shader
@@ -1,4 +1,4 @@
-Shader "Hidden/UIEffect"
+Shader "Hidden/UI/Default (UIEffect)"
{
Properties
{
diff --git a/Packages/UIEffect/Resources/UIHsvModifier.shader b/Packages/UIEffect/Resources/UIHsvModifier.shader
index c2909bb..445182b 100644
--- a/Packages/UIEffect/Resources/UIHsvModifier.shader
+++ b/Packages/UIEffect/Resources/UIHsvModifier.shader
@@ -1,10 +1,10 @@
-Shader "Hidden/UIHsvModifier"
+Shader "Hidden/UI/Default (UIHsvModifier)"
{
Properties
{
[PerRendererData] _MainTex ("Main 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
@@ -21,19 +21,19 @@
SubShader
{
Tags
- {
- "Queue"="Transparent"
- "IgnoreProjector"="True"
- "RenderType"="Transparent"
+ {
+ "Queue"="Transparent"
+ "IgnoreProjector"="True"
+ "RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
-
+
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
- Pass [_StencilOp]
+ Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
@@ -76,4 +76,4 @@
ENDCG
}
}
-}
\ No newline at end of file
+}
diff --git a/Packages/UIEffect/Resources/UIShiny.shader b/Packages/UIEffect/Resources/UIShiny.shader
index 1759891..5520e43 100644
--- a/Packages/UIEffect/Resources/UIShiny.shader
+++ b/Packages/UIEffect/Resources/UIShiny.shader
@@ -1,10 +1,10 @@
-Shader "Hidden/UIShiny"
+Shader "Hidden/UI/Default (UIShiny)"
{
Properties
{
[PerRendererData] _MainTex ("Main 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
@@ -21,19 +21,19 @@ Shader "Hidden/UIShiny"
SubShader
{
Tags
- {
- "Queue"="Transparent"
- "IgnoreProjector"="True"
- "RenderType"="Transparent"
+ {
+ "Queue"="Transparent"
+ "IgnoreProjector"="True"
+ "RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
-
+
Stencil
{
Ref [_Stencil]
Comp [_StencilComp]
- Pass [_StencilOp]
+ Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
@@ -53,9 +53,9 @@ Shader "Hidden/UIShiny"
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
-
+
#pragma multi_compile __ UNITY_UI_ALPHACLIP
-
+
#include "UnityCG.cginc"
#include "UnityUI.cginc"
@@ -69,11 +69,11 @@ Shader "Hidden/UIShiny"
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
color = ApplyShinyEffect(color, IN.eParam);
-
+
#ifdef UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
-
+
return color;
}
ENDCG
diff --git a/Packages/UIEffect/Resources/UITtransition.shader b/Packages/UIEffect/Resources/UITtransition.shader
index 872ffed..d7c168e 100644
--- a/Packages/UIEffect/Resources/UITtransition.shader
+++ b/Packages/UIEffect/Resources/UITtransition.shader
@@ -1,4 +1,4 @@
-Shader "Hidden/UITransition"
+Shader "Hidden/UI/Default (UITransition)"
{
Properties
{
diff --git a/Packages/UIEffect/Scripts/Common/BaseMaterialEffect.cs b/Packages/UIEffect/Scripts/Common/BaseMaterialEffect.cs
index 1669e09..0cf2d7a 100644
--- a/Packages/UIEffect/Scripts/Common/BaseMaterialEffect.cs
+++ b/Packages/UIEffect/Scripts/Common/BaseMaterialEffect.cs
@@ -128,12 +128,13 @@ namespace Coffee.UIEffects
///
protected override void OnEnable()
{
+ base.OnEnable();
+
if (paramTex != null)
{
paramTex.Register(this);
}
- SetVerticesDirty();
SetMaterialDirty();
SetEffectParamsDirty();
@@ -149,7 +150,8 @@ namespace Coffee.UIEffects
///
protected override void OnDisable()
{
- SetVerticesDirty();
+ base.OnDisable();
+
SetMaterialDirty();
if (paramTex != null)
diff --git a/Packages/UIEffect/Scripts/Common/GraphicConnector.cs b/Packages/UIEffect/Scripts/Common/GraphicConnector.cs
index aa6f413..3046297 100644
--- a/Packages/UIEffect/Scripts/Common/GraphicConnector.cs
+++ b/Packages/UIEffect/Scripts/Common/GraphicConnector.cs
@@ -112,14 +112,6 @@ namespace Coffee.UIEffects
graphic.SetMaterialDirty();
}
- ///
- /// Event that is called just before Canvas rendering happens.
- /// This allows you to delay processing / updating of canvas based elements until just before they are rendered.
- ///
- protected virtual void OnWillRenderCanvases()
- {
- }
-
///
/// Gets position factor for area.
///
diff --git a/Packages/UIEffect/Scripts/UIDissolve.cs b/Packages/UIEffect/Scripts/UIDissolve.cs
index 095174c..fcc91e6 100644
--- a/Packages/UIEffect/Scripts/UIDissolve.cs
+++ b/Packages/UIEffect/Scripts/UIDissolve.cs
@@ -219,7 +219,7 @@ namespace Coffee.UIEffects
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
{
var connector = GraphicConnector.FindConnector(graphic);
- newMaterial.shader = connector.FindShader("UIDissolve");
+ newMaterial.shader = Shader.Find(string.Format("Hidden/{0} (UIDissolve)", newMaterial.shader.name));
SetShaderVariants(newMaterial, m_ColorMode);
newMaterial.SetTexture(k_TransitionTexId, transitionTexture);
diff --git a/Packages/UIEffect/Scripts/UIEffect.cs b/Packages/UIEffect/Scripts/UIEffect.cs
index 42ac0ce..63a8ccc 100644
--- a/Packages/UIEffect/Scripts/UIEffect.cs
+++ b/Packages/UIEffect/Scripts/UIEffect.cs
@@ -194,7 +194,7 @@ namespace Coffee.UIEffects
{
var connector = GraphicConnector.FindConnector(graphic);
- newMaterial.shader = connector.FindShader("UIEffect");
+ newMaterial.shader = Shader.Find(string.Format("Hidden/{0} (UIEffect)", newMaterial.shader.name));
SetShaderVariants(newMaterial, m_EffectMode, m_ColorMode, m_BlurMode,
m_AdvancedBlur ? BlurEx.Ex : BlurEx.None);
diff --git a/Packages/UIEffect/Scripts/UIHsvModifier.cs b/Packages/UIEffect/Scripts/UIHsvModifier.cs
index 16335e7..8445bb7 100644
--- a/Packages/UIEffect/Scripts/UIHsvModifier.cs
+++ b/Packages/UIEffect/Scripts/UIHsvModifier.cs
@@ -129,7 +129,7 @@ namespace Coffee.UIEffects
{
var connector = GraphicConnector.FindConnector(graphic);
- newMaterial.shader = connector.FindShader("UIHsvModifier");
+ newMaterial.shader = Shader.Find(string.Format("Hidden/{0} (UIHsvModifier)", newMaterial.shader.name));
paramTex.RegisterMaterial(newMaterial);
}
diff --git a/Packages/UIEffect/Scripts/UIShiny.cs b/Packages/UIEffect/Scripts/UIShiny.cs
index b2cabee..7fd89ef 100644
--- a/Packages/UIEffect/Scripts/UIShiny.cs
+++ b/Packages/UIEffect/Scripts/UIShiny.cs
@@ -194,7 +194,7 @@ namespace Coffee.UIEffects
{
var connector = GraphicConnector.FindConnector(graphic);
- newMaterial.shader = connector.FindShader("UIShiny");
+ newMaterial.shader = Shader.Find(string.Format("Hidden/{0} (UIShiny)", newMaterial.shader.name));
paramTex.RegisterMaterial(newMaterial);
}
diff --git a/Packages/UIEffect/Scripts/UITransitionEffect.cs b/Packages/UIEffect/Scripts/UITransitionEffect.cs
index 3051249..f642975 100644
--- a/Packages/UIEffect/Scripts/UITransitionEffect.cs
+++ b/Packages/UIEffect/Scripts/UITransitionEffect.cs
@@ -234,7 +234,7 @@ namespace Coffee.UIEffects
public override void ModifyMaterial(Material newMaterial, Graphic graphic)
{
var connector = GraphicConnector.FindConnector(graphic);
- newMaterial.shader = connector.FindShader("UITransition");
+ newMaterial.shader = Shader.Find(string.Format("Hidden/{0} (UITransition)", newMaterial.shader.name));
SetShaderVariants(newMaterial, m_EffectMode);
newMaterial.SetTexture(k_TransitionTexId, transitionTexture);