change: change shader name

This commit is contained in:
mob-sakai
2020-06-04 17:18:38 +09:00
parent d539fc935a
commit 1910a8b3e5
12 changed files with 33 additions and 39 deletions
@@ -1,4 +1,4 @@
Shader "Hidden/UIDissolve"
Shader "Hidden/UI/Default (UIDissolve)"
{
Properties
{
+1 -1
View File
@@ -1,4 +1,4 @@
Shader "Hidden/UIEffect"
Shader "Hidden/UI/Default (UIEffect)"
{
Properties
{
@@ -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
}
}
}
}
+12 -12
View File
@@ -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
@@ -1,4 +1,4 @@
Shader "Hidden/UITransition"
Shader "Hidden/UI/Default (UITransition)"
{
Properties
{
@@ -128,12 +128,13 @@ namespace Coffee.UIEffects
/// </summary>
protected override void OnEnable()
{
base.OnEnable();
if (paramTex != null)
{
paramTex.Register(this);
}
SetVerticesDirty();
SetMaterialDirty();
SetEffectParamsDirty();
@@ -149,7 +150,8 @@ namespace Coffee.UIEffects
/// </summary>
protected override void OnDisable()
{
SetVerticesDirty();
base.OnDisable();
SetMaterialDirty();
if (paramTex != null)
@@ -112,14 +112,6 @@ namespace Coffee.UIEffects
graphic.SetMaterialDirty();
}
/// <summary>
/// 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.
/// </summary>
protected virtual void OnWillRenderCanvases()
{
}
/// <summary>
/// Gets position factor for area.
/// </summary>
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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);
}
+1 -1
View File
@@ -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);
}
@@ -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);