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

issue #6: update CCDirector.cpp, CCDirector.h

This commit is contained in:
Ming 2010-07-26 02:00:08 +00:00
parent 073f0720c6
commit da11b924ab
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocos2dx/CCDirector.cpp
View File

@ -33,6 +33,7 @@ THE SOFTWARE.
#include "support/opengl_support/glu.h"
#include "support/CGPointExtension.h"
#include "CCTransition.h"
#include "CCTextureCache.h"
#include <string>
@ -208,7 +209,7 @@ void CCDirector::mainLoop(void)
void CCDirector::calculateDeltaTime(void)
{
struct timeval now;
struct cc_timeval now;
if (gettimeofday(&now, NULL) != 0)
{
@ -729,12 +730,14 @@ void CCDirector::end(void)
#endif
// purge bitmap cache
CCBitmapFontAtlas::purgeCachedData();
// todo: implement CCBitmapFontAtlas
// CCBitmapFontAtlas::purgeCachedData();
// purge all managers
CCSpriteFrameCache::purgeSharedSpriteFrameCache();
CCScheduler::purgeSharedScheduler();
CCActionManager::purgeSharedManager();
// todo: implement CCActionManager
// CCActionManager::purgeSharedManager();
CCTextureCache::purgeSharedTextureCache();
// OpenGL view
@ -795,7 +798,7 @@ void CCDirector::resume(void)
setAnimationInterval(m_dOldAnimationInterval);
if (gettimeofday(&m_sLastUpdate, NULL) != 0)
if (CCTime::gettimeofday(&m_sLastUpdate, NULL) != 0)
{
CCLOG("cocos2d: Director: Error in gettimeofday");
}
@ -857,7 +860,7 @@ void CCDirector::showFPS(void)
// implementation of DisplayLinkDirector
void CCDisplayLinkDirector::startAnimation(void)
{
if (gettimeofday(&m_sLastUpdate, NULL) != 0)
if (CCTime::gettimeofday(&m_sLastUpdate, NULL) != 0)
{
CCLOG("cocos2d: DisplayLinkDirector: Error on gettimeofday");
}

3
cocos2dx/CCDirector.h
View File

@ -37,6 +37,7 @@ THE SOFTWARE.
// #include "support/EAGLView.h"
#include "platform/platform.h"
#include "platform/CCTime.h"
/** @typedef tPixelFormat
Possible Pixel Formats for the EAGLView
@ -478,7 +479,7 @@ protected:
NSMutableArray<CCScene*> *m_pobScenesStack;
/* last time the main loop was updated */
struct timeval m_sLastUpdate;
struct cc_timeval m_sLastUpdate;
/* delta time since last tick to main loop */
ccTime m_fDeltaTime;