pengtaihao
/
ParticleEffectForUGUI
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Assets/Coffee/UIExtensions/UIParticle/UIAdditive.shader
View File

@ -2,7 +2,7 @@
{ {
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
@ -12,6 +12,8 @@
_StencilReadMask ("Stencil Read Mask", Float) = 255 _StencilReadMask ("Stencil Read Mask", Float) = 255
_ColorMask ("Color Mask", Float) = 15 _ColorMask ("Color Mask", Float) = 15
[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
} }
SubShader SubShader
@ -38,53 +40,72 @@
Lighting Off Lighting Off
ZWrite Off ZWrite Off
ZTest [unity_GUIZTestMode] ZTest [unity_GUIZTestMode]
Fog { Mode Off } Blend SrcAlpha One
Blend One One
ColorMask [_ColorMask] ColorMask [_ColorMask]
Pass Pass
{ {
Name "Default"
CGPROGRAM CGPROGRAM
#pragma vertex vert #pragma vertex vert
#pragma fragment frag #pragma fragment frag
#pragma target 2.0
#include "UnityCG.cginc" #include "UnityCG.cginc"
#include "UnityUI.cginc"
#pragma multi_compile __ UNITY_UI_CLIP_RECT
#pragma multi_compile __ UNITY_UI_ALPHACLIP
struct appdata_t struct appdata_t
{ {
float4 vertex : POSITION; float4 vertex : POSITION;
float4 color : COLOR; float4 color : COLOR;
float2 texcoord : TEXCOORD0; float2 texcoord : TEXCOORD0;
UNITY_VERTEX_INPUT_INSTANCE_ID
}; };
struct v2f struct v2f
{ {
float4 vertex : SV_POSITION; float4 vertex : SV_POSITION;
fixed4 color : COLOR; fixed4 color : COLOR;
half2 texcoord : TEXCOORD0; float2 texcoord : TEXCOORD0;
float4 worldPosition : TEXCOORD1;
UNITY_VERTEX_OUTPUT_STEREO
}; };
sampler2D _MainTex;
fixed4 _Color; fixed4 _Color;
fixed4 _TextureSampleAdd;
float4 _ClipRect;
float4 _MainTex_ST;
v2f vert(appdata_t IN) v2f vert(appdata_t v)
{ {
v2f OUT; v2f OUT;
OUT.vertex = UnityObjectToClipPos(IN.vertex); UNITY_SETUP_INSTANCE_ID(v);
OUT.texcoord = IN.texcoord; UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
#ifdef UNITY_HALF_TEXEL_OFFSET OUT.worldPosition = v.vertex;
OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); OUT.vertex = UnityObjectToClipPos(OUT.worldPosition);
#endif
OUT.color = IN.color * _Color; OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex);
OUT.color = v.color * _Color;
return OUT; return OUT;
} }
sampler2D _MainTex;
fixed4 frag(v2f IN) : SV_Target fixed4 frag(v2f IN) : SV_Target
{ {
half4 color = tex2D(_MainTex, IN.texcoord) * IN.color; half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;
color.rgb *= color.a;
clip (color.a - 0.01); #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; return color;
} }
ENDCG ENDCG

2
Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
View File

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