fix #17; Rect mask 2D doesn't work

pull/33/head
mob-sakai 2018-12-12 21:41:11 +09:00
parent f35d8fa8e7
commit efabe81ae0
2 changed files with 103 additions and 80 deletions

View File

@ -1,93 +1,114 @@
Shader "UI/Additive" Shader "UI/Additive"
{ {
Properties Properties
{ {
_MainTex ("Sprite Texture", 2D) = "white" {} [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
_Color ("Tint", Color) = (1,1,1,1) _Color ("Tint", Color) = (1,1,1,1)
_StencilComp ("Stencil Comparison", Float) = 8 _StencilComp ("Stencil Comparison", Float) = 8
_Stencil ("Stencil ID", Float) = 0 _Stencil ("Stencil ID", Float) = 0
_StencilOp ("Stencil Operation", Float) = 0 _StencilOp ("Stencil Operation", Float) = 0
_StencilWriteMask ("Stencil Write Mask", Float) = 255 _StencilWriteMask ("Stencil Write Mask", Float) = 255
_StencilReadMask ("Stencil Read Mask", Float) = 255 _StencilReadMask ("Stencil Read Mask", Float) = 255
_ColorMask ("Color Mask", Float) = 15 _ColorMask ("Color Mask", Float) = 15
}
SubShader [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
{ }
Tags
{
"Queue"="Transparent"
"IgnoreProjector"="True"
"RenderType"="Transparent"
"PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Stencil SubShader
{ {
Ref [_Stencil] Tags
Comp [_StencilComp] {
Pass [_StencilOp] "Queue"="Transparent"
ReadMask [_StencilReadMask] "IgnoreProjector"="True"
WriteMask [_StencilWriteMask] "RenderType"="Transparent"
} "PreviewType"="Plane"
"CanUseSpriteAtlas"="True"
}
Cull Off Stencil
Lighting Off {
ZWrite Off Ref [_Stencil]
Comp [_StencilComp]
Pass [_StencilOp]
ReadMask [_StencilReadMask]
WriteMask [_StencilWriteMask]
}
Cull Off
Lighting Off
ZWrite Off
ZTest [unity_GUIZTestMode] ZTest [unity_GUIZTestMode]
Fog { Mode Off } Blend SrcAlpha One
Blend One One ColorMask [_ColorMask]
ColorMask [_ColorMask] Pass
{
Name "Default"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#pragma target 2.0
Pass #include "UnityCG.cginc"
{ #include "UnityUI.cginc"
CGPROGRAM
#pragma vertex vert
#pragma fragment frag
#include "UnityCG.cginc"
struct appdata_t #pragma multi_compile __ UNITY_UI_CLIP_RECT
{ #pragma multi_compile __ UNITY_UI_ALPHACLIP
float4 vertex : POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD0;
};
struct v2f struct appdata_t
{ {
float4 vertex : SV_POSITION; float4 vertex : POSITION;
fixed4 color : COLOR; float4 color : COLOR;
half2 texcoord : TEXCOORD0; float2 texcoord : TEXCOORD0;
}; UNITY_VERTEX_INPUT_INSTANCE_ID
};
fixed4 _Color; struct v2f
{
float4 vertex : SV_POSITION;
fixed4 color : COLOR;
float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
};
v2f vert(appdata_t IN) sampler2D _MainTex;
{ fixed4 _Color;
v2f OUT; fixed4 _TextureSampleAdd;
OUT.vertex = UnityObjectToClipPos(IN.vertex); float4 _ClipRect;
OUT.texcoord = IN.texcoord; float4 _MainTex_ST;
#ifdef UNITY_HALF_TEXEL_OFFSET
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
#endif
OUT.color = IN.color * _Color;
return OUT;
}
sampler2D _MainTex; v2f vert(appdata_t v)
{
v2f OUT;
UNITY_SETUP_INSTANCE_ID(v);
UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
OUT.worldPosition = v.vertex;
OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
fixed4 frag(v2f IN) : SV_Target OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
{
half4 color = tex2D(_MainTex, IN.texcoord) * IN.color; OUT.color = v.color * _Color;
color.rgb *= color.a; return OUT;
clip (color.a - 0.01); }
return color;
} fixed4 frag(v2f IN) : SV_Target
ENDCG {
} half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
}
#ifdef UNITY_UI_CLIP_RECT
color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect);
#endif
#ifdef UNITY_UI_ALPHACLIP
clip (color.a - 0.001);
#endif
return color;
}
ENDCG
}
}
} }

View File

@ -179,6 +179,8 @@ namespace Coffee.UIExtensions
} }
} }
SetParent (newParent); SetParent (newParent);
base.OnTransformParentChanged ();
} }
protected override void OnDidApplyAnimationProperties () protected override void OnDidApplyAnimationProperties ()