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

Merge pull request #1073 from dumganhar/gles20 

Added some resources. Updated Texture2dTest.cpp.
This commit is contained in:
James Chen 2012-06-28 02:40:08 -07:00
parent 94e78f2dec 26a02804d9
commit 41c38492b7
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
ecab9afc457e142e9fcb5d7ff4dfd6ef3152e865

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

@ -0,0 +1 @@
f8b2ca57289d0938dcf7a295f7f404fb2ee71b56

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

@ -0,0 +1 @@
f65579564b3c7dde5cf1509b7282dcf0f919de87

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

@ -0,0 +1 @@
418e418cfd4ff613c1af658a02c7cd40b650f05f

4
tests/proj.android/build_native.sh
View File

@ -63,6 +63,10 @@ done
# remove test_image_rgba4444.pvr.gz # remove test_image_rgba4444.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_image_rgba4444.pvr.gz rm -f $TESTS_ROOT/assets/Images/test_image_rgba4444.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgba8888.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgb888.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgba4444.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_1021x1024_a8.pvr.gz
# build # build
if [[ $buildexternalsfromsource ]]; then if [[ $buildexternalsfromsource ]]; then

16
tests/tests/Texture2dTest/Texture2dTest.cpp
View File

@ -1524,6 +1524,21 @@ void TextureMemoryAlloc::updateImage(cocos2d::CCObject *sender)
case 0: case 0:
file = "Images/test_1021x1024.png"; file = "Images/test_1021x1024.png";
break; break;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
// android can not pack .gz file into apk file
case 1:
file = "Images/test_1021x1024_rgba8888.pvr";
break;
case 2:
file = "Images/test_1021x1024_rgb888.pvr";
break;
case 3:
file = "Images/test_1021x1024_rgba4444.pvr";
break;
case 4:
file = "Images/test_1021x1024_a8.pvr";
break;
#else
case 1: case 1:
file = "Images/test_1021x1024_rgba8888.pvr.gz"; file = "Images/test_1021x1024_rgba8888.pvr.gz";
break; break;
@ -1536,6 +1551,7 @@ void TextureMemoryAlloc::updateImage(cocos2d::CCObject *sender)
case 4: case 4:
file = "Images/test_1021x1024_a8.pvr.gz"; file = "Images/test_1021x1024_a8.pvr.gz";
break; break;
#endif
} }
m_pBackground = CCSprite::create(file.c_str()); m_pBackground = CCSprite::create(file.c_str());