mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-20 01:42:37 +08:00
Compare commits
2 Commits
4.0.0-preview.8
...
upm
| Author | SHA1 | Date | |
|---|---|---|---|
| 332340e7bc | |||
| b43e40508b |
@@ -1,3 +1,17 @@
|
||||
# [4.0.0-preview.10](https://github.com/mob-sakai/UIEffect/compare/v4.0.0-preview.9...v4.0.0-preview.10) (2023-11-09)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ExecuteInEditMode to ExecuteAlways ([c750810](https://github.com/mob-sakai/UIEffect/commit/c75081095f580b12730b06f9a668a991bb5e8fe6))
|
||||
|
||||
# [4.0.0-preview.9](https://github.com/mob-sakai/UIEffect/compare/v4.0.0-preview.8...v4.0.0-preview.9) (2020-06-09)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add a new property to access EffectPlayer at runtime ([d92efa9](https://github.com/mob-sakai/UIEffect/commit/d92efa98a1fc7b78d3421d9ee0b4bdaa74511bdc)), closes [#214](https://github.com/mob-sakai/UIEffect/issues/214) [#215](https://github.com/mob-sakai/UIEffect/issues/215)
|
||||
|
||||
# [4.0.0-preview.8](https://github.com/mob-sakai/UIEffect/compare/v4.0.0-preview.7...v4.0.0-preview.8) (2020-06-04)
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Shader "Hidden/UIDissolve"
|
||||
Shader "Hidden/UI/Default (UIDissolve)"
|
||||
{
|
||||
Properties
|
||||
{
|
||||
|
||||
@@ -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
@@ -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)
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Coffee.UIEffects
|
||||
/// </summary>
|
||||
[RequireComponent(typeof(Graphic))]
|
||||
[RequireComponent(typeof(RectTransform))]
|
||||
[ExecuteInEditMode]
|
||||
[ExecuteAlways]
|
||||
public abstract class BaseMeshEffect : UIBehaviour, IMeshModifier
|
||||
{
|
||||
RectTransform _rectTransform;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -196,7 +196,7 @@ namespace Coffee.UIEffects
|
||||
get { return s_ParamTex; }
|
||||
}
|
||||
|
||||
EffectPlayer effectPlayer
|
||||
public EffectPlayer effectPlayer
|
||||
{
|
||||
get { return m_Player ?? (m_Player = new EffectPlayer()); }
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
+2
-2
@@ -15,7 +15,7 @@ namespace Coffee.UIEffects
|
||||
/// <summary>
|
||||
/// UIEffect.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[ExecuteAlways]
|
||||
[RequireComponent(typeof(Graphic))]
|
||||
[DisallowMultipleComponent]
|
||||
[AddComponentMenu("UI/UIEffects/UIEffect", 1)]
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -153,7 +153,7 @@ namespace Coffee.UIEffects
|
||||
get { return s_ParamTex; }
|
||||
}
|
||||
|
||||
EffectPlayer effectPlayer
|
||||
public EffectPlayer effectPlayer
|
||||
{
|
||||
get { return m_Player ?? (m_Player = new EffectPlayer()); }
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Coffee.UIEffects
|
||||
/// <summary>
|
||||
/// Dissolve effect for uGUI.
|
||||
/// </summary>
|
||||
[ExecuteInEditMode]
|
||||
[ExecuteAlways]
|
||||
public class UISyncEffect : BaseMaterialEffect
|
||||
{
|
||||
[Tooltip("The target effect to synchronize.")] [SerializeField]
|
||||
|
||||
@@ -192,7 +192,7 @@ namespace Coffee.UIEffects
|
||||
set { m_PassRayOnHidden = value; }
|
||||
}
|
||||
|
||||
EffectPlayer effectPlayer
|
||||
public EffectPlayer effectPlayer
|
||||
{
|
||||
get { return m_Player ?? (m_Player = new EffectPlayer()); }
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "com.coffee.ui-effect",
|
||||
"displayName": "UI Effect",
|
||||
"description": "UI Effect provides visual effect components for Unity UI.\nLet's decorate your UI with effects!",
|
||||
"version": "4.0.0-preview.8",
|
||||
"version": "4.0.0-preview.10",
|
||||
"unity": "2017.1",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user