[Tizen.AIAvatar] Refactor AIAvatar

src/Tizen.AIAvatar/src/public/Avatar/Info/AnimationInfo.cs → src/Tizen.AIAvatar/src/Animations/AnimationInfo.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,35 @@
  * limitations under the License.
  *
  */
+
 using System.ComponentModel;
 using Tizen.NUI.Scene3D;
 
 namespace Tizen.AIAvatar
 {
+    /// <summary>  
+    /// The AnimationInfo class manages animation data for an Avatar, including motion data and names. It is not meant to be directly edited by users or editors.  
+    /// </summary>  
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class AnimationInfo
     {
+        /// <summary>  
+        /// Gets the motion data associated with this animation.  
+        /// </summary>  
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public MotionData MotionData { get; internal set; }
+        public MotionData MotionData { get; private set; }
+
+        /// <summary>  
+        /// Gets the name of this animation.  
+        /// </summary>  
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public string MotionName { get; internal set; }
+        public string MotionName { get; private set; }
 
+        /// <summary>  
+        /// Initializes a new instance of the AnimationInfo class with the specified motion data and name.  
+        /// </summary>  
+        /// <param name="motionData">TheThe motion data associated with this animation.</param>
+        /// <param name="motionName">The name of this animation.</param>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AnimationInfo(MotionData motionData, string motionName)
         {

src/Tizen.AIAvatar/src/public/Avatar/Animations/AvatarMotionChangedEventArgs.cs → src/Tizen.AIAvatar/src/Animations/AvatarMotionChangedEventArgs.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,19 @@
 
 namespace Tizen.AIAvatar
 {
-    /// <summary>
-    /// 
-    /// </summary>
+    /// <summary>   
+    /// This class provides arguments for handling avatar motion change events.
+    /// <member name = "Previous" > The previous state of the avatar's motion.</member>  
+    /// <member name = "Current" > The current state of the avatar's motion.</member>  
+    /// </summary>  
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class AvatarMotionChangedEventArgs : EventArgs
     {
+        /// <summary>  
+        /// Initializes a new instance of the AvatarMotionChangedEventArgs class with the specified previous and current states.  
+        /// </summary>  
+        /// <param name="previous">The previous state of the avatar's motion.</param>  
+        /// <param name="current">The current state of the avatar's motion.</param>  
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AvatarMotionChangedEventArgs(AvatarMotionState previous, AvatarMotionState current)
         {
@@ -36,7 +43,6 @@ public AvatarMotionChangedEventArgs(AvatarMotionState previous, AvatarMotionStat
         /// <summary>
         /// The previous state.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AvatarMotionState Previous
         {
@@ -47,7 +53,6 @@ public AvatarMotionState Previous
         /// <summary>
         /// The current state.
         /// </summary>
-        /// <since_tizen> 3 </since_tizen>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AvatarMotionState Current
         {

src/Tizen.AIAvatar/src/public/Avatar/Animations/AvatarMotionState.cs → src/Tizen.AIAvatar/src/Animations/AvatarMotionState.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ namespace Tizen.AIAvatar
     /// <summary>
     /// Enumeration for the states.
     /// </summary>
-    /// <since_tizen> 3 </since_tizen>
     [EditorBrowsable(EditorBrowsableState.Never)]
     public enum AvatarMotionState
     {

src/Tizen.AIAvatar/src/public/Avatar/Animations/AnimationModule/EyeBlinker.cs → src/Tizen.AIAvatar/src/Animations/EyeBlinker.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,19 @@
  */
 
 using System;
-using System.ComponentModel;
 using Tizen.NUI;
-using Tizen.NUI.Scene3D;
 
 using static Tizen.AIAvatar.AIAvatar;
 
 namespace Tizen.AIAvatar
 {
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    internal class EyeBlinker : AnimationModule
+    internal class EyeBlinker : IBlendShapeModule, IDisposable
     {
+        private AvatarMotionState currentMotionState = AvatarMotionState.Unavailable;
+
+        private readonly Object motionChangedLock = new Object();
+        private event EventHandler<AvatarMotionChangedEventArgs> motionChanged;
+
         private const int blinkIntervalMinimum = 800;
         private const int blinkIntervalMaximum = 3000;
         private Animation eyeAnimation;
@@ -36,39 +38,84 @@ internal class EyeBlinker : AnimationModule
         private bool isPlaying = false;
         private const int blinkDuration = 200;
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        internal EyeBlinker()
+        public AvatarMotionState CurrentMotionState
+        {
+            get
+            {
+                return currentMotionState;
+            }
+            set
+            {
+                if (currentMotionState == value)
+                {
+                    return;
+                }
+                var preState = currentMotionState;
+                currentMotionState = value;
+                if (motionChanged != null)
+                {
+                    motionChanged?.Invoke(this, new AvatarMotionChangedEventArgs(preState, currentMotionState));
+                }
+            }
+        }
+
+        public event EventHandler<AvatarMotionChangedEventArgs> MotionStateChanged
+        {
+            add
+            {
+                lock (motionChangedLock)
+                {
+                    motionChanged += value;
+                }
+
+            }
+
+            remove
+            {
+                lock (motionChangedLock)
+                {
+                    if (motionChanged == null)
+                    {
+                        Log.Error(LogTag, "Remove StateChanged Failed : motionChanged is null");
+                        return;
+                    }
+                    motionChanged -= value;
+                }
+            }
+        }
+
+        public EyeBlinker()
         {
 
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override void Init(Animation eyeAnimation)
+        public void Dispose()
+        {
+            DestroyAnimation();
+        }
+
+        public void Init(Animation eyeAnimation)
         {
             this.eyeAnimation = eyeAnimation;
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override void Play(IAnimationModuleData data)
+        public void Play()
         {
             //data
             StartEyeBlink();
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override void Stop()
+        public void Stop()
         {
             StopEyeBlink();
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override void Pause()
+        public void Pause()
         {
             eyeAnimation?.Pause();
         }
 
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override void Destroy()
+        public void Destroy()
         {
             DestroyAnimation();
         }

src/Tizen.AIAvatar/src/internal/BlendShapeInfo/BlendShapeValue.cs → src/Tizen.AIAvatar/src/Animations/IBlendShapeModule.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2024 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,21 @@
  *
  */
 
-using System.ComponentModel;
+using Tizen.NUI;
 
 namespace Tizen.AIAvatar
 {
-    internal class BlendShapeValue
+    internal interface IBlendShapeModule
     {
-        internal string nodeName;
-        internal BlendShapeType blendIndex;
-        internal float blendValue;
+        public void Init(Animation animation);
+
+        public void Play();
+
+        public void Stop();
+
+        public void Pause();
+
+        public void Destroy();
     }
+
 }

src/Tizen.AIAvatar/src/public/Avatar/Animations/AnimationModule/MotionPlayer.cs → src/Tizen.AIAvatar/src/Animations/MotionPlayer.cs

@@ -15,28 +15,26 @@
  *
  */
 
-using System.ComponentModel;
 using Tizen.NUI;
 using Tizen.NUI.Scene3D;
-
 using static Tizen.AIAvatar.AIAvatar;
 
 namespace Tizen.AIAvatar
 {
     internal class MotionPlayer
     {
         private Animation motionAnimation;
+        private EyeBlinker eyeBlinker;
+
         internal Animation MotionAnimation { get => motionAnimation; private set => motionAnimation = value; }
 
         internal MotionPlayer()
         {
+            eyeBlinker = new EyeBlinker();
+
 
         }
 
-        /// <summary>
-        /// Play avatar animation by AnimationInfo
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
         internal void PlayAnimation(Animation motionAnimation, int duration = 3000, bool isLooping = false, int loopCount = 1)
         {
             ResetAnimations();
@@ -51,24 +49,42 @@ internal void PlayAnimation(Animation motionAnimation, int duration = 3000, bool
             }
         }
 
-        /// <summary>
-        /// Pause avatar animation
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
         internal void PauseMotionAnimation()
         {
             MotionAnimation?.Pause();
         }
 
-        /// <summary>
-        /// Stop avatar animation
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
         internal void StopMotionAnimation()
         {
             MotionAnimation?.Stop();
         }
 
+        internal void SetBlinkAnimation(Animation blinkerAnimation)
+        {
+            eyeBlinker?.Init(blinkerAnimation);
+        }
+
+        internal void StartEyeBlink()
+        {
+            eyeBlinker?.Play();
+        }
+
+        internal void PauseEyeBlink()
+        {
+            eyeBlinker?.Pause();
+        }
+
+
+        internal void StopEyeBlink()
+        {
+            eyeBlinker?.Stop();
+        }
+
+        internal void DestroyAnimations()
+        {
+            eyeBlinker?.Destroy();
+        }
+
         private void ResetAnimations()
         {
             if (MotionAnimation != null)
@@ -78,5 +94,6 @@ private void ResetAnimations()
                 MotionAnimation = null;
             }
         }
+
     }
 }