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

prefixing ivars

This commit is contained in:
mannewalis 2014-07-03 10:13:46 -07:00
parent 69341095fe
commit 96605f801c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cocos/2d/CCNode.h
View File

@ -1464,14 +1464,14 @@ public:
virtual void setOpacityModifyRGB(bool value) {CC_UNUSED_PARAM(value);}
virtual bool isOpacityModifyRGB() const { return false; };
void setOnEnterCallback(const std::function<void()>& callback) {onEnterCallback = callback;}
const std::function<void()>& getOnEnterCallback() const {return onEnterCallback;}
void setOnExitCallback(const std::function<void()>& callback) {onExitCallback = callback;}
const std::function<void()>& getOnExitCallback() const {return onExitCallback;}
void setonEnterTransitionDidFinishCallback(const std::function<void()>& callback) {onEnterTransitionDidFinishCallback = callback;}
const std::function<void()>& getonEnterTransitionDidFinishCallback() const {return onEnterTransitionDidFinishCallback;}
void setonExitTransitionDidStartCallback(const std::function<void()>& callback) {onExitTransitionDidStartCallback = callback;}
const std::function<void()>& getonExitTransitionDidStartCallback() const {return onExitTransitionDidStartCallback;}
void setOnEnterCallback(const std::function<void()>& callback) { _onEnterCallback = callback; }
const std::function<void()>& getOnEnterCallback() const { return _onEnterCallback; }
void setOnExitCallback(const std::function<void()>& callback) { _onExitCallback = callback; }
const std::function<void()>& getOnExitCallback() const { return _onExitCallback; }
void setonEnterTransitionDidFinishCallback(const std::function<void()>& callback) { _onEnterTransitionDidFinishCallback = callback; }
const std::function<void()>& getonEnterTransitionDidFinishCallback() const { return _onEnterTransitionDidFinishCallback; }
void setonExitTransitionDidStartCallback(const std::function<void()>& callback) { _onExitTransitionDidStartCallback = callback; }
const std::function<void()>& getonExitTransitionDidStartCallback() const { return _onExitTransitionDidStartCallback; }
CC_CONSTRUCTOR_ACCESS:
// Nodes should be created using create();
@ -1611,10 +1611,10 @@ protected:
static int s_globalOrderOfArrival;
std::function<void()> onEnterCallback;
std::function<void()> onExitCallback;
std::function<void()> onEnterTransitionDidFinishCallback;
std::function<void()> onExitTransitionDidStartCallback;
std::function<void()> _onEnterCallback;
std::function<void()> _onExitCallback;
std::function<void()> _onEnterTransitionDidFinishCallback;
std::function<void()> _onExitTransitionDidStartCallback;
private:
CC_DISALLOW_COPY_AND_ASSIGN(Node);