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

Merge pull request #2103 from minggo/iss1686-synchronize 

Fix some errors in TestCpp
This commit is contained in:
minggo 2013-03-04 18:52:24 -08:00
parent da0aadefe4 ae3c104fba
commit e10123af19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/CCDirector.cpp
View File

@ -198,7 +198,7 @@ void CCDirector::setGLDefaultValues(void)
setAlphaBlending(true);
// XXX: Fix me, should enable/disable depth test according the depth format as cocos2d-iphone did
// [self setDepthTest: view_.depthFormat];
setDepthTest(true);
setDepthTest(false);
setProjection(m_eProjection);
// set other opengl default values

6
samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp
View File

@ -193,7 +193,11 @@ void TextureDemo::onEnter()
item1->setPosition(ccp(VisibleRect::center().x - item2->getContentSize().width*2, VisibleRect::bottom().y+item2->getContentSize().height/2));
item2->setPosition(ccp(VisibleRect::center().x, VisibleRect::bottom().y+item2->getContentSize().height/2));
item3->setPosition(ccp(VisibleRect::center().x + item2->getContentSize().width*2, VisibleRect::bottom().y+item2->getContentSize().height/2));
addChild(menu, 1);
addChild(menu, 1);
CCLayerColor *col = CCLayerColor::create(ccc4(128,128,128,255));
addChild(col, -10);
CCTextureCache::sharedTextureCache()->dumpCachedTextureInfo();
}