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

fixed #79

This commit is contained in:
Ming 2010-08-24 01:56:09 +00:00
parent 8c88676d27
commit 1cb377bca8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/CCDirector.h
View File

@ -440,12 +440,18 @@ protected:
void mainLoop(void); void mainLoop(void);
void setNextScene(void); void setNextScene(void);
// shows the FPS in the screen // shows the FPS in the screen
#if CC_DIRECTOR_FAST_FPS
void showFPS(void); void showFPS(void);
#else
void showFPS(void) {}
#endif // CC_DIRECTOR_FAST_FPS
// calculates delta time since last time it was called // calculates delta time since last time it was called
void calculateDeltaTime(void); void calculateDeltaTime(void);
#if defined CC_ENABLE_PROFILERS #if CC_ENABLE_PROFILERS
void showProfilers(void); void showProfilers(void);
#endif // CC_ENABLE_PROFILERS #endif // CC_ENABLE_PROFILERS

2
cocos2dx/base_nodes/CCAtlasNode.cpp
View File

@ -65,7 +65,7 @@ CCAtlasNode * CCAtlasNode::initWithTileFile(const char *tile, int tileWidth, int
// also, using: self.textureAtlas supports re-initialization without leaking // also, using: self.textureAtlas supports re-initialization without leaking
this->m_pTextureAtlas = new CCTextureAtlas(); this->m_pTextureAtlas = new CCTextureAtlas();
m_pTextureAtlas->initWithFile(tile, itemsToRender); m_pTextureAtlas->initWithFile(tile, itemsToRender);
m_pTextureAtlas->release(); // m_pTextureAtlas->release();
this->updateBlendFunc(); this->updateBlendFunc();
this->updateOpacityModifyRGB(); this->updateOpacityModifyRGB();