mirror of https://github.com/axmolengine/axmol.git
Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion
This commit is contained in:
commit
e2169bb0fc
|
@ -35,6 +35,7 @@ THE SOFTWARE.
|
||||||
#include "CCGeometry.h"
|
#include "CCGeometry.h"
|
||||||
#include "CCEGLView.h"
|
#include "CCEGLView.h"
|
||||||
#include "CCGL.h"
|
#include "CCGL.h"
|
||||||
|
#include "CCNode.h"
|
||||||
|
|
||||||
namespace cocos2d {
|
namespace cocos2d {
|
||||||
|
|
||||||
|
@ -137,7 +138,6 @@ typedef enum {
|
||||||
class CCLabelTTF;
|
class CCLabelTTF;
|
||||||
class CCScene;
|
class CCScene;
|
||||||
class CCEGLView;
|
class CCEGLView;
|
||||||
class CCNode;
|
|
||||||
class CCProjectionProtocol;
|
class CCProjectionProtocol;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -211,6 +211,19 @@ public:
|
||||||
*/
|
*/
|
||||||
inline bool isSendCleanupToScene(void) { return m_bSendCleanupToScene; }
|
inline bool isSendCleanupToScene(void) { return m_bSendCleanupToScene; }
|
||||||
|
|
||||||
|
/** This object will be visited after the main scene is visited.
|
||||||
|
This object MUST implement the "visit" selector.
|
||||||
|
Useful to hook a notification object, like CCNotifications (http://github.com/manucorporat/CCNotifications)
|
||||||
|
@since v0.99.5
|
||||||
|
*/
|
||||||
|
inline CCNode* getNotificationNode() { return m_pNotificationNode; }
|
||||||
|
inline void setNotificationNode(CCNode *node)
|
||||||
|
{
|
||||||
|
CC_SAFE_RELEASE(m_pNotificationNode);
|
||||||
|
m_pNotificationNode = node;
|
||||||
|
CC_SAFE_RETAIN(m_pNotificationNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// window size
|
// window size
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue