Skip to content

Commit a62f3ff

Browse files
committed
chore: Add more fade in/out functions
1 parent 140f322 commit a62f3ff

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

Assets/JCSUnity/Scripts/Effects/JCS_FadeObject.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public class JCS_FadeObject : JCS_UnityObject
9292

9393
public bool effect { get { return mEffect; } set { mEffect = value; } }
9494
public bool visible { get { return mVisible; } set { mVisible = value; } }
95+
public JCS_FadeType fadeType { get { return mFadeType; } }
9596
public float fadeTime { get { return mFadeTime; } set { mFadeTime = value; } }
9697
public bool overrideFade { get { return mOverrideFade; } set { mOverrideFade = value; } }
9798
public float alpha { get { return mAlpha; } set { mAlpha = value; } }
@@ -146,6 +147,22 @@ public bool IsFadeOut()
146147
return (mAlpha <= mFadeOutAmount);
147148
}
148149

150+
/// <summary>
151+
/// Return true if we are fading in.
152+
/// </summary>
153+
public bool IsFadingIn()
154+
{
155+
return mEffect && mFadeType == JCS_FadeType.IN;
156+
}
157+
158+
/// <summary>
159+
/// Return true if we are fading out.
160+
/// </summary>
161+
public bool IsFadingOut()
162+
{
163+
return mEffect && mFadeType == JCS_FadeType.OUT;
164+
}
165+
149166
/// <summary>
150167
/// Fade out.
151168
/// </summary>
@@ -244,6 +261,7 @@ private void DoFade()
244261
localEnabled = false;
245262

246263
mEffect = false;
264+
mFadeType = JCS_FadeType.NONE;
247265

248266
// do callback
249267
{
@@ -264,6 +282,7 @@ private void DoFade()
264282
if (mAlpha > mFadeInAmount)
265283
{
266284
mEffect = false;
285+
mFadeType = JCS_FadeType.NONE;
267286

268287
// do callback
269288
{

0 commit comments

Comments
 (0)