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

Merge pull request #422 from minggo/iss625 

[android] fixed #625
This commit is contained in:
minggo 2011-07-26 20:56:27 -07:00
parent 33e85bdc53 657fe9a17d
commit b4cb43913b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test.android/build_native.sh
View File

@ -22,6 +22,8 @@ do
fi fi
done done
# remove test_image_rgba4444.pvr.gz
rm -f $TESTS_ROOT/assets/Images/test_image_rgba4444.pvr.gz
# build # build
pushd $ANDROID_NDK_ROOT pushd $ANDROID_NDK_ROOT

5
tests/tests/Texture2dTest/Texture2dTest.cpp
View File

@ -609,7 +609,12 @@ void TexturePVRRGBA4444GZ::onEnter()
TextureDemo::onEnter(); TextureDemo::onEnter();
CCSize s = CCDirector::sharedDirector()->getWinSize(); CCSize s = CCDirector::sharedDirector()->getWinSize();
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
// android can not pack .gz file into apk file
CCSprite *img = CCSprite::spriteWithFile("Images/test_image_rgba4444.pvr");
#else
CCSprite *img = CCSprite::spriteWithFile("Images/test_image_rgba4444.pvr.gz"); CCSprite *img = CCSprite::spriteWithFile("Images/test_image_rgba4444.pvr.gz");
#endif
img->setPosition(ccp( s.width/2.0f, s.height/2.0f)); img->setPosition(ccp( s.width/2.0f, s.height/2.0f));
addChild(img); addChild(img);
CCTextureCache::sharedTextureCache()->dumpCachedTextureInfo(); CCTextureCache::sharedTextureCache()->dumpCachedTextureInfo();