Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2790: Uses Map<K, V> instead of Dictionary in CCBAnimationManager.

This commit is contained in:
James Chen 2013-12-09 18:17:04 +08:00
parent ad5daeb962
commit 64fd2386a9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -33,9 +33,6 @@ CCBAnimationManager::CCBAnimationManager()
bool CCBAnimationManager::init() bool CCBAnimationManager::init()
{ {
_keyframeCallFuncs = new Dictionary();
_keyframeCallFuncs->init();
_target = NULL; _target = NULL;
_animationCompleteCallbackFunc = NULL; _animationCompleteCallbackFunc = NULL;
@ -68,7 +65,6 @@ CCBAnimationManager::~CCBAnimationManager()
} }
} }
CC_SAFE_RELEASE(_keyframeCallFuncs);
CC_SAFE_RELEASE(_target); CC_SAFE_RELEASE(_target);
} }
@ -640,13 +636,17 @@ Object* CCBAnimationManager::actionForCallbackChannel(CCBSequenceProperty* chann
CCBReader::TargetType selectorTarget = (CCBReader::TargetType)keyVal[1].asInt(); CCBReader::TargetType selectorTarget = (CCBReader::TargetType)keyVal[1].asInt();
if(_jsControlled) { if(_jsControlled) {
String* callbackName = String::createWithFormat("%d:%s", selectorTarget, selectorName.c_str()); std::stringstream callbackName;
Object* callback = _keyframeCallFuncs->objectForKey(callbackName->getCString()); callbackName << static_cast<int>(selectorTarget);
callbackName << ":" + selectorName;
auto callback = _keyframeCallFuncs.at(callbackName.str());
if (nullptr != callback) if (nullptr != callback)
{ {
CallFunc *callbackClone = (static_cast<CallFunc*>(callback))->clone(); CallFunc* callbackClone = callback->clone();
if(callbackClone != NULL) { if (callbackClone != NULL)
{
actions.pushBack(callbackClone); actions.pushBack(callbackClone);
} }
} }
@ -908,8 +908,9 @@ void CCBAnimationManager::setAnimationCompletedCallback(Object *target, SEL_Call
_animationCompleteCallbackFunc = callbackFunc; _animationCompleteCallbackFunc = callbackFunc;
} }
void CCBAnimationManager::setCallFunc(CallFunc* callFunc, const std::string &callbackNamed) { void CCBAnimationManager::setCallFunc(CallFunc* callFunc, const std::string &callbackNamed)
_keyframeCallFuncs->setObject((Object*)callFunc, callbackNamed); {
_keyframeCallFuncs.insert(callbackNamed, callFunc);
} }
void CCBAnimationManager::sequenceCompleted() void CCBAnimationManager::sequenceCompleted()

2
cocos/editor-support/cocosbuilder/CCBAnimationManager.h
View File

@ -146,7 +146,7 @@ private:
cocos2d::Vector<cocos2d::Node*> _documentCallbackNodes; cocos2d::Vector<cocos2d::Node*> _documentCallbackNodes;
cocos2d::ValueVector _documentCallbackControlEvents; cocos2d::ValueVector _documentCallbackControlEvents;
cocos2d::ValueVector _keyframeCallbacks; cocos2d::ValueVector _keyframeCallbacks;
cocos2d::Dictionary *_keyframeCallFuncs; cocos2d::Map<std::string, cocos2d::CallFunc*> _keyframeCallFuncs;
std::string _documentControllerName; std::string _documentControllerName;
std::string _lastCompletedSequenceName; std::string _lastCompletedSequenceName;