Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update ActionGroup

This commit is contained in:
Nomango 2020-06-28 16:22:46 +08:00
parent 418eab5667
commit c3361187da
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kiwano/2d/action/ActionGroup.cpp
View File

@ -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

8
src/kiwano/2d/action/ActionGroup.h
View File

@ -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_;
};

6
src/kiwano/2d/action/ActionHelper.h
View File

@ -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));
}
};