From c3361187daec58ecac62281bfe580a4647735516 Mon Sep 17 00:00:00 2001
From: Nomango <nomango@qq.com>
Date: Sun, 28 Jun 2020 16:22:46 +0800
Subject: [PATCH] update ActionGroup

---
 src/kiwano/2d/action/ActionGroup.cpp | 18 +++++++++---------
 src/kiwano/2d/action/ActionGroup.h   |  8 ++++----
 src/kiwano/2d/action/ActionHelper.h  |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/kiwano/2d/action/ActionGroup.cpp b/src/kiwano/2d/action/ActionGroup.cpp
index 3aa633d5..bff4986d 100644
--- a/src/kiwano/2d/action/ActionGroup.cpp
+++ b/src/kiwano/2d/action/ActionGroup.cpp
@@ -25,24 +25,24 @@
 namespace kiwano
 {
 
-ActionGroupPtr ActionGroup::Create(const Vector<ActionPtr>& actions, bool sync)
+ActionGroupPtr ActionGroup::Create(const Vector<ActionPtr>& actions, bool parallel)
 {
     ActionGroupPtr ptr = memory::New<ActionGroup>();
     if (ptr)
     {
-        ptr->sync_ = sync;
+        ptr->parallel_ = parallel;
         ptr->AddActions(actions);
     }
     return ptr;
 }
 
 ActionGroup::ActionGroup()
-    : sync_(false)
+    : parallel_(false)
 {
 }
 
-ActionGroup::ActionGroup(bool sync)
-    : sync_(sync)
+ActionGroup::ActionGroup(bool parallel)
+    : parallel_(parallel)
 {
 }
 
@@ -56,7 +56,7 @@ void ActionGroup::Init(Actor* target)
         return;
     }
 
-    if (sync_)
+    if (parallel_)
     {
         // init all actions
         for (current_ = actions_.GetFirst(); current_; current_ = current_->GetNext())
@@ -73,7 +73,7 @@ void ActionGroup::Init(Actor* target)
 
 void ActionGroup::Update(Actor* target, Duration dt)
 {
-    if (!sync_)
+    if (!parallel_)
     {
         if (current_)
         {
@@ -133,7 +133,7 @@ ActionPtr ActionGroup::Clone() const
             actions.push_back(action->Clone());
         }
     }
-    return DoClone(ActionGroup::Create(actions, sync_));
+    return DoClone(ActionGroup::Create(actions, parallel_));
 }
 
 ActionPtr ActionGroup::Reverse() const
@@ -146,7 +146,7 @@ ActionPtr ActionGroup::Reverse() const
             actions.push_back(action->Reverse());
         }
     }
-    return DoClone(ActionGroup::Create(actions, sync_));
+    return DoClone(ActionGroup::Create(actions, parallel_));
 }
 
 }  // namespace kiwano
diff --git a/src/kiwano/2d/action/ActionGroup.h b/src/kiwano/2d/action/ActionGroup.h
index 867a9a98..95a7ff80 100644
--- a/src/kiwano/2d/action/ActionGroup.h
+++ b/src/kiwano/2d/action/ActionGroup.h
@@ -40,12 +40,12 @@ public:
     /// \~chinese
     /// @brief 创建动画组合
     /// @param actions 动画集合
-    /// @param sync 同步执行
-    static ActionGroupPtr Create(const Vector<ActionPtr>& actions, bool sync = false);
+    /// @param parallel 同步执行
+    static ActionGroupPtr Create(const Vector<ActionPtr>& actions, bool parallel = false);
 
     ActionGroup();
 
-    ActionGroup(bool sync);
+    ActionGroup(bool parallel);
 
     virtual ~ActionGroup();
 
@@ -77,7 +77,7 @@ protected:
     void Update(Actor* target, Duration dt) override;
 
 private:
-    bool       sync_;
+    bool       parallel_;
     ActionPtr  current_;
     ActionList actions_;
 };
diff --git a/src/kiwano/2d/action/ActionHelper.h b/src/kiwano/2d/action/ActionHelper.h
index 072ae0b5..f0c727b0 100644
--- a/src/kiwano/2d/action/ActionHelper.h
+++ b/src/kiwano/2d/action/ActionHelper.h
@@ -359,10 +359,10 @@ public:
     /// \~chinese
     /// @brief 动画组合
     /// @param actions 动画集合
-    /// @param sync 同步执行
-    static inline ActionHelper Group(const Vector<ActionPtr>& actions, bool sync = false)
+    /// @param parallel 同步执行
+    static inline ActionHelper Group(const Vector<ActionPtr>& actions, bool parallel = false)
     {
-        return ActionHelper(ActionGroup::Create(actions, sync));
+        return ActionHelper(ActionGroup::Create(actions, parallel));
     }
 };