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

Merge pull request #1015 from minggo/gles20 

issue #1310:synchronize some codes
This commit is contained in:
minggo 2012-06-12 19:46:45 -07:00
parent 716c90805b b282d52a65
commit f80fd0c232
8 changed files with 122 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Resources/Images/test_1021x1024.png.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
148fa797a0a84fcbfac307b2d8482fd60b3002ff

1
tests/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
8e1219b732d1ee3fd7270ce9f60c88e94dbb082a

1
tests/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0f2bff88acfd23787b3262d2b3b1f21f27c05e78

1
tests/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
6dc9a563f11917ddea9db8ed1ff59da6762d34b1

6
tests/tests/ShaderTest/ShaderTest.cpp
View File

@ -85,9 +85,9 @@ bool ShaderTestDemo::init()
CCMenu *menu = CCMenu::menuWithItems(item1, item2, item3, NULL);
menu->setPosition(ccp(0, 0));
item1->setPosition(s.width/2-100, 30);
item2->setPosition(s.width/2, 30);
item3->setPosition(s.width/2 + 100, 30);
item1->setPosition(s.width/2- item2->getContentSize().width*2, item2->getContentSize().height/2);
item2->setPosition(s.width/2, item2->getContentSize().height/2);
item3->setPosition(s.width/2 + item2->getContentSize().width*2, item2->getContentSize().height/2);
addChild(menu, 1);
return true;

2
tests/tests/SpriteTest/SpriteTest.cpp.REMOVED.git-id
View File

@ -1 +1 @@
30f90defc4364cbcd8e686f75010ac83a50fb386
d45a5f1bd2f7a3c21828ba6d806255a3a78f2806

162
tests/tests/Texture2dTest/Texture2dTest.cpp
View File

@ -86,7 +86,7 @@ CCLayer* createTextureTest(int index)
case 33:
pLayer = new TextureDrawInRect(); break;
case 34:
pLayer = new FileUtilsTest(); break;
pLayer = new TextureMemoryAlloc(); break;
default:
break;
}
@ -1444,65 +1444,6 @@ std::string TextureDrawInRect::subtitle()
return "draws 2 textures using drawInRect";
}
// FileUtilsTest
void FileUtilsTest::onEnter()
{
TextureDemo::onEnter();
// This test is only valid in Retinadisplay
if( CC_CONTENT_SCALE_FACTOR() == 2 ) {
CCSprite *sprite = new CCSprite();
sprite->initWithFile("Images/bugs/test_issue_1179.png");
if( sprite )
CCLog("Test #1 issue 1179: OK");
else
CCLog("Test #1 issue 1179: FAILED");
sprite->release();
sprite = new CCSprite();
sprite->initWithFile("only_in_hd.pvr.ccz");
if( sprite )
CCLog("Test #2 issue 1179: OK");
else
CCLog("Test #2 issue 1179: FAILED");
sprite->release();
} else {
CCLog("Test issue #1179 failed. Needs to be tested with RetinaDispaly");
}
#if 0 // TODO:(CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
// Testint CCFileUtils API
bool ret = false;
ret = CCFileUtils::sharedFileUtils()->iPhoneRetinaDisplayFileExistsAtPath("Images/bugs/test_issue_1179.png");
if( ret )
CCLog("Test #3: retinaDisplayFileExistsAtPath: OK");
else
CCLog("Test #3: retinaDisplayFileExistsAtPath: FAILED");
ret = CCFileUtils::sharedFileUtils()->iPhoneRetinaDisplayFileExistsAtPath("grossini-does_no_exist.png");
if( !ret )
CCLog("Test #4: retinaDisplayFileExistsAtPath: OK");
else
CCLog("Test #4: retinaDisplayFileExistsAtPath: FAILED");
#endif
}
std::string FileUtilsTest::title()
{
return "CCFileUtils: See console";
}
std::string FileUtilsTest::subtitle()
{
return "See the console";
}
//------------------------------------------------------------------
//
// TextureTestScene
@ -1514,3 +1455,104 @@ void TextureTestScene::runThisTest()
addChild(pLayer);
CCDirector::sharedDirector()->replaceScene(this);
}
//------------------------------------------------------------------
//
// TextureMemoryAlloc
//
//------------------------------------------------------------------
void TextureMemoryAlloc::onEnter()
{
TextureDemo::onEnter();
m_pBackground = NULL;
CCMenuItemFont::setFontSize(24);
CCMenuItem *item1 = CCMenuItemFont::itemWithString("PNG", this, menu_selector(TextureMemoryAlloc::updateImage));
item1->setTag(0);
CCMenuItem *item2 = CCMenuItemFont::itemWithString("RGBA8", this, menu_selector(TextureMemoryAlloc::updateImage));
item2->setTag(1);
CCMenuItem *item3 = CCMenuItemFont::itemWithString("RGB8", this, menu_selector(TextureMemoryAlloc::updateImage));
item3->setTag(2);
CCMenuItem *item4 = CCMenuItemFont::itemWithString("RGBA4", this, menu_selector(TextureMemoryAlloc::updateImage));
item4->setTag(3);
CCMenuItem *item5 = CCMenuItemFont::itemWithString("A8", this, menu_selector(TextureMemoryAlloc::updateImage));
item5->setTag(4);
CCMenu *menu = CCMenu::menuWithItems(item1, item2, item3, item4, item5, NULL);
menu->alignItemsHorizontally();
addChild(menu);
CCMenuItemFont *warmup = CCMenuItemFont::itemWithString("warm up texture", this, menu_selector(TextureMemoryAlloc::changeBackgroundVisible));
CCMenu *menu2 = CCMenu::menuWithItems(warmup, NULL);
menu2->alignItemsHorizontally();
addChild(menu2);
CCSize s = CCDirector::sharedDirector()->getWinSize();
menu2->setPosition(ccp(s.width/2, s.height/4));
}
void TextureMemoryAlloc::changeBackgroundVisible(cocos2d::CCObject *sender)
{
if (m_pBackground)
{
m_pBackground->setIsVisible(true);
}
}
void TextureMemoryAlloc::updateImage(cocos2d::CCObject *sender)
{
if (m_pBackground)
{
m_pBackground->removeFromParentAndCleanup(true);
}
CCTextureCache::sharedTextureCache()->removeUnusedTextures();
int tag = ((CCNode*)sender)->getTag();
string file;
switch (tag)
{
case 0:
file = "Images/test_1021x1024.png";
break;
case 1:
file = "Images/test_1021x1024_rgba8888.pvr.gz";
break;
case 2:
file = "Images/test_1021x1024_rgb888.pvr.gz";
break;
case 3:
file = "Images/test_1021x1024_rgba4444.pvr.gz";
break;
case 4:
file = "Images/test_1021x1024_a8.pvr.gz";
break;
}
m_pBackground = CCSprite::spriteWithFile(file.c_str());
addChild(m_pBackground, -10);
m_pBackground->setIsVisible(false);
CCSize s = CCDirector::sharedDirector()->getWinSize();
m_pBackground->setPosition(ccp(s.width/2, s.height/2));
}
string TextureMemoryAlloc::title()
{
return "Texture memory";
}
string TextureMemoryAlloc::subtitle()
{
return "Testing Texture Memory allocation. Use Instruments + VM Tracker";
}

20
tests/tests/Texture2dTest/Texture2dTest.h
View File

@ -277,14 +277,6 @@ public:
virtual void onEnter();
};
class FileUtilsTest : public TextureDemo
{
public:
virtual std::string title();
virtual std::string subtitle();
virtual void onEnter();
};
class TextureDrawAtPoint : public TextureDemo
{
public:
@ -315,4 +307,16 @@ public:
virtual void runThisTest();
};
class TextureMemoryAlloc : public TextureDemo
{
public:
virtual void onEnter();
virtual std::string title();
virtual std::string subtitle();
void updateImage(CCObject *sender);
void changeBackgroundVisible(CCObject *sender);
private:
CCSprite *m_pBackground;
};
#endif // __TEXTURE2D_TEST_H__