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

Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

This commit is contained in:
natural-law 2011-07-12 17:47:24 +08:00
parent e6bc8d7c98 bf42201f83
commit d4e575c4b2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/cocoa/CCNS.h
View File

@ -39,7 +39,7 @@ namespace cocos2d
@return A Core Graphics structure that represents a rectangle. @return A Core Graphics structure that represents a rectangle.
If the string is not well-formed, the function returns CCRectZero. If the string is not well-formed, the function returns CCRectZero.
*/ */
CCRect CCRectFromString(const char* pszContent); CCRect CC_DLL CCRectFromString(const char* pszContent);
/** /**
@brief Returns a Core Graphics point structure corresponding to the data in a given string. @brief Returns a Core Graphics point structure corresponding to the data in a given string.
@ -51,7 +51,7 @@ namespace cocos2d
@return A Core Graphics structure that represents a point. @return A Core Graphics structure that represents a point.
If the string is not well-formed, the function returns CCPointZero. If the string is not well-formed, the function returns CCPointZero.
*/ */
CCPoint CCPointFromString(const char* pszContent); CCPoint CC_DLL CCPointFromString(const char* pszContent);
/** /**
@brief Returns a Core Graphics size structure corresponding to the data in a given string. @brief Returns a Core Graphics size structure corresponding to the data in a given string.
@ -63,7 +63,7 @@ namespace cocos2d
@return A Core Graphics structure that represents a size. @return A Core Graphics structure that represents a size.
If the string is not well-formed, the function returns CCSizeZero. If the string is not well-formed, the function returns CCSizeZero.
*/ */
CCSize CCSizeFromString(const char* pszContent); CCSize CC_DLL CCSizeFromString(const char* pszContent);
} }
#endif // __PLATFOMR_CCNS_H__ #endif // __PLATFOMR_CCNS_H__

8
tests/tests/TransitionsTest/TransitionsTest.cpp
View File

@ -127,6 +127,7 @@ class PageTransitionForward : public CCTransitionPageTurn
public: public:
static CCTransitionScene* transitionWithDuration(ccTime t, CCScene* s) static CCTransitionScene* transitionWithDuration(ccTime t, CCScene* s)
{ {
CCDirector::sharedDirector()->setDepthTest(true);
return CCTransitionPageTurn::transitionWithDuration(t, s, false); return CCTransitionPageTurn::transitionWithDuration(t, s, false);
} }
}; };
@ -136,6 +137,7 @@ class PageTransitionBackward : public CCTransitionPageTurn
public: public:
static CCTransitionScene* transitionWithDuration(ccTime t, CCScene* s) static CCTransitionScene* transitionWithDuration(ccTime t, CCScene* s)
{ {
CCDirector::sharedDirector()->setDepthTest(true);
return CCTransitionPageTurn::transitionWithDuration(t, s, true); return CCTransitionPageTurn::transitionWithDuration(t, s, true);
} }
}; };
@ -186,6 +188,9 @@ static int s_nSceneIdx = 0;
CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s) CCTransitionScene* createTransition(int nIndex, ccTime t, CCScene* s)
{ {
// fix bug #486, without setDepthTest(false), FlipX,Y will flickers
CCDirector::sharedDirector()->setDepthTest(false);
switch(nIndex) switch(nIndex)
{ {
case 0: return CCTransitionJumpZoom::transitionWithDuration(t, s); case 0: return CCTransitionJumpZoom::transitionWithDuration(t, s);
@ -274,9 +279,6 @@ void TransitionsTestScene::runThisTest()
addChild(pLayer); addChild(pLayer);
pLayer->release(); pLayer->release();
// fix bug #486, without setDepthTest(false), FlipX,Y will flickers
CCDirector::sharedDirector()->setDepthTest(false);
CCDirector::sharedDirector()->replaceScene(this); CCDirector::sharedDirector()->replaceScene(this);
} }