diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/UIEffectBase.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/UIEffectBase.cs index 1046d5e..4b8b8d2 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/UIEffectBase.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/Common/UIEffectBase.cs @@ -63,7 +63,7 @@ namespace Coffee.UIExtensions ModifyMaterial(); SetVerticesDirty (); - SetDirty (); + SetEffectDirty (); } public void OnBeforeSerialize() @@ -131,7 +131,7 @@ namespace Coffee.UIExtensions } ModifyMaterial(); SetVerticesDirty(); - SetDirty(); + SetEffectDirty(); } /// @@ -152,14 +152,14 @@ namespace Coffee.UIExtensions /// /// Mark the UIEffect as dirty. /// - protected virtual void SetDirty() + protected virtual void SetEffectDirty() { SetVerticesDirty(); } protected override void OnDidApplyAnimationProperties() { - SetDirty(); + SetEffectDirty(); } } } diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs index 4cec39a..ff45a3c 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIDissolve.cs @@ -80,7 +80,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_EffectFactor, value)) { m_EffectFactor = value; - SetDirty(); + SetEffectDirty(); } } } @@ -97,7 +97,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_EffectFactor, value)) { m_EffectFactor = value; - SetDirty(); + SetEffectDirty(); } } } @@ -114,7 +114,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Width, value)) { m_Width = value; - SetDirty(); + SetEffectDirty(); } } } @@ -131,7 +131,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Softness, value)) { m_Softness = value; - SetDirty(); + SetEffectDirty(); } } } @@ -147,7 +147,7 @@ namespace Coffee.UIExtensions if (m_Color != value) { m_Color = value; - SetDirty(); + SetEffectDirty(); } } } @@ -364,7 +364,7 @@ namespace Coffee.UIExtensions } } - protected override void SetDirty() + protected override void SetEffectDirty() { foreach(var m in materials) { diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs index 69ff52d..3f88caa 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIEffect.cs @@ -107,7 +107,7 @@ namespace Coffee.UIExtensions set { m_EffectFactor = Mathf.Clamp(value, 0, 1); - SetDirty(); + SetEffectDirty (); } } @@ -120,7 +120,7 @@ namespace Coffee.UIExtensions set { m_EffectFactor = Mathf.Clamp(value, 0, 1); - SetDirty(); + SetEffectDirty (); } } @@ -133,7 +133,7 @@ namespace Coffee.UIExtensions set { m_ColorFactor = Mathf.Clamp(value, 0, 1); - SetDirty(); + SetEffectDirty (); } } @@ -147,7 +147,7 @@ namespace Coffee.UIExtensions set { m_BlurFactor = Mathf.Clamp(value, 0, 1); - SetDirty(); + SetEffectDirty (); } } @@ -161,7 +161,7 @@ namespace Coffee.UIExtensions set { m_BlurFactor = Mathf.Clamp(value, 0, 1); - SetDirty(); + SetEffectDirty (); } } @@ -195,7 +195,7 @@ namespace Coffee.UIExtensions set { graphic.color = value; - SetDirty(); + SetEffectDirty (); } } @@ -329,7 +329,7 @@ namespace Coffee.UIExtensions } } - protected override void SetDirty() + protected override void SetEffectDirty () { foreach (var m in materials) { diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs index 52138f2..f14b784 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIHsvModifier.cs @@ -56,7 +56,7 @@ namespace Coffee.UIExtensions if (m_TargetColor != value) { m_TargetColor = value; - SetDirty(); + SetEffectDirty (); } } } @@ -73,7 +73,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Range, value)) { m_Range = value; - SetDirty(); + SetEffectDirty (); } } } @@ -90,7 +90,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Saturation, value)) { m_Saturation = value; - SetDirty(); + SetEffectDirty (); } } } @@ -107,7 +107,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Value, value)) { m_Value = value; - SetDirty(); + SetEffectDirty (); } } } @@ -124,7 +124,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Hue, value)) { m_Hue = value; - SetDirty(); + SetEffectDirty (); } } } @@ -168,7 +168,7 @@ namespace Coffee.UIExtensions } } - protected override void SetDirty() + protected override void SetEffectDirty () { float h, s, v; Color.RGBToHSV(m_TargetColor, out h, out s, out v); diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs index 2d9037f..de26928 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs @@ -87,7 +87,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_EffectFactor, value)) { m_EffectFactor = value; - SetDirty(); + SetEffectDirty(); } } } @@ -104,7 +104,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_EffectFactor, value)) { m_EffectFactor = value; - SetDirty(); + SetEffectDirty(); } } } @@ -121,7 +121,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Width, value)) { m_Width = value; - SetDirty(); + SetEffectDirty(); } } } @@ -138,7 +138,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Softness, value)) { m_Softness = value; - SetDirty(); + SetEffectDirty(); } } } @@ -156,7 +156,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Brightness, value)) { m_Brightness = value; - SetDirty(); + SetEffectDirty(); } } } @@ -173,7 +173,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Brightness, value)) { m_Brightness = value; - SetDirty(); + SetEffectDirty(); } } } @@ -191,7 +191,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Gloss, value)) { m_Gloss = value; - SetDirty(); + SetEffectDirty(); } } } @@ -208,7 +208,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_Gloss, value)) { m_Gloss = value; - SetDirty(); + SetEffectDirty(); } } } @@ -379,7 +379,7 @@ namespace Coffee.UIExtensions _player.Stop(reset); } - protected override void SetDirty() + protected override void SetEffectDirty() { foreach (var m in materials) { diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs index e2f6bbe..b21553a 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UITransitionEffect.cs @@ -77,7 +77,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_EffectFactor, value)) { m_EffectFactor = value; - SetDirty(); + SetEffectDirty (); } } } @@ -139,7 +139,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_DissolveWidth, value)) { m_DissolveWidth = value; - SetDirty(); + SetEffectDirty (); } } } @@ -156,7 +156,7 @@ namespace Coffee.UIExtensions if (!Mathf.Approximately(m_DissolveSoftness, value)) { m_DissolveSoftness = value; - SetDirty(); + SetEffectDirty (); } } } @@ -172,7 +172,7 @@ namespace Coffee.UIExtensions if (m_DissolveColor != value) { m_DissolveColor = value; - SetDirty(); + SetEffectDirty (); } } } @@ -312,7 +312,7 @@ namespace Coffee.UIExtensions _player.OnDisable(); } - protected override void SetDirty() + protected override void SetEffectDirty () { foreach (var m in materials) {