feat: modify EffectPlayer at runtime

close #214, close #215
mob-sakai · Jun 4, 2020 · 8483ba6 · 8483ba6
1 parent 5b6e2e5
commit 8483ba6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/Packages/UIEffect/Scripts/UIDissolve.cs b/Packages/UIEffect/Scripts/UIDissolve.cs
@@ -196,6 +196,11 @@ public override ParameterTexture paramTex
             get { return s_ParamTex; }
         }
 
+        EffectPlayer effectPlayer
+        {
+            get { return m_Player ?? (m_Player = new EffectPlayer()); }
+        }
+
         public override Hash128 GetMaterialHash(Material material)
         {
             if (!isActiveAndEnabled || !material || !material.shader)
@@ -288,32 +293,27 @@ protected override void OnDidApplyAnimationProperties()
         /// </summary>
         public void Play(bool reset = true)
         {
-            _player.Play(reset);
+            effectPlayer.Play(reset);
         }
 
         /// <summary>
         /// Stop effect.
         /// </summary>
         public void Stop(bool reset = true)
         {
-            _player.Stop(reset);
+            effectPlayer.Stop(reset);
         }
 
         protected override void OnEnable()
         {
             base.OnEnable();
-            _player.OnEnable((f) => effectFactor = m_Reverse ? 1f - f : f);
+            effectPlayer.OnEnable((f) => effectFactor = m_Reverse ? 1f - f : f);
         }
 
         protected override void OnDisable()
         {
             base.OnDisable();
-            _player.OnDisable();
-        }
-
-        EffectPlayer _player
-        {
-            get { return m_Player ?? (m_Player = new EffectPlayer()); }
+            effectPlayer.OnDisable();
         }
     }
 }
diff --git a/Packages/UIEffect/Scripts/UIShiny.cs b/Packages/UIEffect/Scripts/UIShiny.cs
@@ -153,13 +153,18 @@ public override ParameterTexture paramTex
             get { return s_ParamTex; }
         }
 
+        EffectPlayer effectPlayer
+        {
+            get { return m_Player ?? (m_Player = new EffectPlayer()); }
+        }
+
         /// <summary>
         /// This function is called when the object becomes enabled and active.
         /// </summary>
         protected override void OnEnable()
         {
             base.OnEnable();
-            _player.OnEnable(f => effectFactor = f);
+            effectPlayer.OnEnable(f => effectFactor = f);
         }
 
         /// <summary>
@@ -168,7 +173,7 @@ protected override void OnEnable()
         protected override void OnDisable()
         {
             base.OnDisable();
-            _player.OnDisable();
+            effectPlayer.OnDisable();
         }
 
 
@@ -233,15 +238,15 @@ public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         /// </summary>
         public void Play(bool reset = true)
         {
-            _player.Play(reset);
+            effectPlayer.Play(reset);
         }
 
         /// <summary>
         /// Stop effect.
         /// </summary>
         public void Stop(bool reset = true)
         {
-            _player.Stop(reset);
+            effectPlayer.Stop(reset);
         }
 
         protected override void SetEffectParamsDirty()
@@ -269,10 +274,5 @@ protected override void OnDidApplyAnimationProperties()
                 || _lastEffectArea != m_EffectArea)
                 SetVerticesDirty();
         }
-
-        EffectPlayer _player
-        {
-            get { return m_Player ?? (m_Player = new EffectPlayer()); }
-        }
     }
 }
diff --git a/Packages/UIEffect/Scripts/UITransitionEffect.cs b/Packages/UIEffect/Scripts/UITransitionEffect.cs
@@ -192,22 +192,27 @@ public bool passRayOnHidden
             set { m_PassRayOnHidden = value; }
         }
 
+        EffectPlayer effectPlayer
+        {
+            get { return m_Player ?? (m_Player = new EffectPlayer()); }
+        }
+
         /// <summary>
         /// Show transition.
         /// </summary>
         public void Show(bool reset = true)
         {
-            _player.loop = false;
-            _player.Play(reset, f => effectFactor = f);
+            effectPlayer.loop = false;
+            effectPlayer.Play(reset, f => effectFactor = f);
         }
 
         /// <summary>
         /// Hide transition.
         /// </summary>
         public void Hide(bool reset = true)
         {
-            _player.loop = false;
-            _player.Play(reset, f => effectFactor = 1 - f);
+            effectPlayer.loop = false;
+            effectPlayer.Play(reset, f => effectFactor = 1 - f);
         }
 
 
@@ -277,8 +282,8 @@ public override void ModifyMesh(VertexHelper vh, Graphic graphic)
         protected override void OnEnable()
         {
             base.OnEnable();
-            _player.OnEnable(null);
-            _player.loop = false;
+            effectPlayer.OnEnable(null);
+            effectPlayer.loop = false;
         }
 
         /// <summary>
@@ -287,7 +292,7 @@ protected override void OnEnable()
         protected override void OnDisable()
         {
             base.OnDisable();
-            _player.OnDisable();
+            effectPlayer.OnDisable();
         }
 
         protected override void SetEffectParamsDirty()
@@ -323,10 +328,5 @@ protected override void OnDidApplyAnimationProperties()
             if (_lastKeepAspectRatio != m_KeepAspectRatio)
                 SetVerticesDirty();
         }
-
-        EffectPlayer _player
-        {
-            get { return m_Player ?? (m_Player = new EffectPlayer()); }
-        }
     }
 }