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

Merge pull request #11393 from akermen/v3_fix_macros_namespace 

added 'cocos2d' namespace for macros
This commit is contained in:
minggo 2015-04-13 11:20:36 +08:00
parent 5321f2a437 2957263c9d
commit 1d1d574a61
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/base/ccMacros.h
View File

@ -124,7 +124,7 @@ do { \
*/ */
#define CC_DIRECTOR_END() \ #define CC_DIRECTOR_END() \
do { \ do { \
Director *__director = Director::getInstance(); \ Director *__director = cocos2d::Director::getInstance(); \
__director->end(); \ __director->end(); \
} while(0) } while(0)
@ -132,7 +132,7 @@ do { \
On Mac it returns 1; On Mac it returns 1;
On iPhone it returns 2 if RetinaDisplay is On. Otherwise it returns 1 On iPhone it returns 2 if RetinaDisplay is On. Otherwise it returns 1
*/ */
#define CC_CONTENT_SCALE_FACTOR() Director::getInstance()->getContentScaleFactor() #define CC_CONTENT_SCALE_FACTOR() cocos2d::Director::getInstance()->getContentScaleFactor()
/****************************/ /****************************/
/** RETINA DISPLAY ENABLED **/ /** RETINA DISPLAY ENABLED **/
@ -257,10 +257,10 @@ It should work same as apples CFSwapInt32LittleToHost(..)
Increments the GL Draws counts by one. Increments the GL Draws counts by one.
The number of calls per frame are displayed on the screen when the Director's stats are enabled. The number of calls per frame are displayed on the screen when the Director's stats are enabled.
*/ */
#define CC_INCREMENT_GL_DRAWS(__n__) Director::getInstance()->getRenderer()->addDrawnBatches(__n__) #define CC_INCREMENT_GL_DRAWS(__n__) cocos2d::Director::getInstance()->getRenderer()->addDrawnBatches(__n__)
#define CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(__drawcalls__, __vertices__) \ #define CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(__drawcalls__, __vertices__) \
do { \ do { \
auto __renderer__ = Director::getInstance()->getRenderer(); \ auto __renderer__ = cocos2d::Director::getInstance()->getRenderer(); \
__renderer__->addDrawnBatches(__drawcalls__); \ __renderer__->addDrawnBatches(__drawcalls__); \
__renderer__->addDrawnVertices(__vertices__); \ __renderer__->addDrawnVertices(__vertices__); \
} while(0) } while(0)