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

Action新增getTarget函数，获取执行该动作的目标

This commit is contained in:
Nomango 2017-10-08 12:45:59 +08:00
parent 388337bbef
commit 414cfc156c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Easy2D/Action/Action.cpp
View File

@ -71,6 +71,11 @@ Action * Action::reverse() const
return nullptr; return nullptr;
} }
Sprite * Action::getTarget()
{
return m_pTargetSprite;
}
void Action::_reset() void Action::_reset()
{ {
m_bEnding = false; m_bEnding = false;

6
Easy2D/Object/Sprite.cpp
View File

@ -76,7 +76,7 @@ void Sprite::addAction(Action * action)
void Sprite::resumeAction(Action * action) void Sprite::resumeAction(Action * action)
{ {
if (action->m_pTargetSprite == this) if (action->getTarget() == this)
{ {
ActionManager::resumeAction(action); ActionManager::resumeAction(action);
} }
@ -84,7 +84,7 @@ void Sprite::resumeAction(Action * action)
void Sprite::pauseAction(Action * action) void Sprite::pauseAction(Action * action)
{ {
if (action->m_pTargetSprite == this) if (action->getTarget() == this)
{ {
ActionManager::pauseAction(action); ActionManager::pauseAction(action);
} }
@ -92,7 +92,7 @@ void Sprite::pauseAction(Action * action)
void Sprite::stopAction(Action * action) void Sprite::stopAction(Action * action)
{ {
if (action->m_pTargetSprite == this) if (action->getTarget() == this)
{ {
ActionManager::stopAction(action); ActionManager::stopAction(action);
} }

2
Easy2D/easy2d.h
View File

@ -1101,6 +1101,8 @@ public:
virtual Action * copy() const = 0; virtual Action * copy() const = 0;
// 获取一个新的逆向动作 // 获取一个新的逆向动作
virtual Action * reverse() const; virtual Action * reverse() const;
// 获取执行该动作的目标
virtual Sprite * getTarget();
protected: protected:
bool m_bRunning; bool m_bRunning;