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

Merge remote-tracking branch 'origin/gles20' into gles20

This commit is contained in:
dualface 2012-09-14 17:57:56 +08:00
parent 2869aba7b4 4aa74d8f5e
commit 62709d7c71
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cocos2dx/CCDirector.cpp
View File

@ -73,21 +73,20 @@ NS_CC_BEGIN
// XXX it shoul be a Director ivar. Move it there once support for multiple directors is added // XXX it shoul be a Director ivar. Move it there once support for multiple directors is added
// singleton stuff // singleton stuff
static CCDisplayLinkDirector s_SharedDirector; static CCDisplayLinkDirector *s_SharedDirector = NULL;
#define kDefaultFPS 60 // 60 frames per second #define kDefaultFPS 60 // 60 frames per second
extern const char* cocos2dVersion(void); extern const char* cocos2dVersion(void);
CCDirector* CCDirector::sharedDirector(void) CCDirector* CCDirector::sharedDirector(void)
{ {
static bool s_bFirstUseDirector = true; if (!s_SharedDirector)
if (s_bFirstUseDirector)
{ {
s_bFirstUseDirector = false; s_SharedDirector = new CCDisplayLinkDirector();
s_SharedDirector.init(); s_SharedDirector->init();
} }
return &s_SharedDirector; return s_SharedDirector;
} }
CCDirector::CCDirector(void) CCDirector::CCDirector(void)
@ -162,7 +161,7 @@ bool CCDirector::init(void)
CCDirector::~CCDirector(void) CCDirector::~CCDirector(void)
{ {
CCLOG("cocos2d: deallocing %p", this); CCLOG("cocos2d: deallocing CCDirector %p", this);
CC_SAFE_RELEASE(m_pFPSLabel); CC_SAFE_RELEASE(m_pFPSLabel);
CC_SAFE_RELEASE(m_pSPFLabel); CC_SAFE_RELEASE(m_pSPFLabel);
@ -185,6 +184,8 @@ CCDirector::~CCDirector(void)
CC_SAFE_DELETE(m_pLastUpdate); CC_SAFE_DELETE(m_pLastUpdate);
// delete fps string // delete fps string
delete []m_pszFPS; delete []m_pszFPS;
s_SharedDirector = NULL;
} }
void CCDirector::setGLDefaultValues(void) void CCDirector::setGLDefaultValues(void)
@ -593,6 +594,7 @@ void CCDirector::purgeDirector()
{ {
// cleanup scheduler // cleanup scheduler
getScheduler()->unscheduleAllSelectors(); getScheduler()->unscheduleAllSelectors();
getActionManager()->removeAllActions();
// don't release the event handlers // don't release the event handlers
// They are needed in case the director is run again // They are needed in case the director is run again
@ -643,6 +645,9 @@ void CCDirector::purgeDirector()
// OpenGL view // OpenGL view
m_pobOpenGLView->end(); m_pobOpenGLView->end();
m_pobOpenGLView = NULL; m_pobOpenGLView = NULL;
// delete CCDirector
release();
} }
void CCDirector::setNextScene(void) void CCDirector::setNextScene(void)

2
cocos2dx/platform/mac/CCCommon.mm
View File

@ -47,7 +47,7 @@ void CCLog(const char * pszFormat, ...)
void CCLuaLog(const char * pszFormat) void CCLuaLog(const char * pszFormat)
{ {
CCLog(pszFormat); CCLog("%s", pszFormat);
} }
// ios no MessageBox, use CCLog instead // ios no MessageBox, use CCLog instead

7
cocos2dx/platform/mac/CCDirectorCaller.mm
View File

@ -59,10 +59,15 @@ static id s_sharedDirectorCaller;
-(void) dealloc -(void) dealloc
{ {
s_sharedDirectorCaller = nil; s_sharedDirectorCaller = nil;
NSLog(@"cocos2d: deallocing CCDirectorCaller %@", self); CCLOG("cocos2d: deallocing CCDirectorCaller %x", (unsigned int)self);
if (displayLink) { if (displayLink) {
CVDisplayLinkRelease(displayLink); CVDisplayLinkRelease(displayLink);
} }
CCLOG("--------------------------------------------------------------------------------");
CCLOG("");
CCLOG("");
CCLOG("");
[super dealloc]; [super dealloc];
} }