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

Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion

This commit is contained in:
minggo 2011-11-25 10:19:29 +08:00
parent f5bbad5833 2d68830241
commit 837e5048d2
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos2dx/CCDirector.cpp
View File

@ -835,6 +835,18 @@ void CCDirector::setContentScaleFactor(CGFloat scaleFactor)
}
}
CCNode* CCDirector::getNotificationNode()
{
return m_pNotificationNode;
}
void CCDirector::setNotificationNode(CCNode *node)
{
CC_SAFE_RELEASE(m_pNotificationNode);
m_pNotificationNode = node;
CC_SAFE_RETAIN(m_pNotificationNode);
}
void CCDirector::applyOrientation(void)
{
CCSize s = m_obWinSizeInPixels;

12
cocos2dx/include/CCDirector.h
View File

@ -35,7 +35,6 @@ THE SOFTWARE.
#include "CCGeometry.h"
#include "CCEGLView.h"
#include "CCGL.h"
#include "CCNode.h"
namespace cocos2d {
@ -139,6 +138,7 @@ class CCLabelTTF;
class CCScene;
class CCEGLView;
class CCProjectionProtocol;
class CCNode;
/**
@brief Class that creates and handle the main Window and manages how
@ -216,14 +216,8 @@ public:
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);
}
CCNode* getNotificationNode();
void setNotificationNode(CCNode *node);
// window size