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

fixed #923: init iamge type and refactor a little codes

This commit is contained in:
minggo 2011-12-22 15:38:31 +08:00
parent a0fe048f11
commit a96285b617
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/platform/CCImage.h
View File

@ -40,6 +40,7 @@ public:
kFmtJpg = 0, kFmtJpg = 0,
kFmtPng, kFmtPng,
kFmtRawData, kFmtRawData,
kFmtUnKnown
}EImageFormat; }EImageFormat;
typedef enum typedef enum

56
cocos2dx/textures/CCTextureCache.cpp
View File

@ -68,6 +68,22 @@ static sem_t s_sem;
static std::queue<AsyncStruct*> *s_pAsyncStructQueue; static std::queue<AsyncStruct*> *s_pAsyncStructQueue;
static std::queue<ImageInfo*> *s_pImageQueue; static std::queue<ImageInfo*> *s_pImageQueue;
static CCImage::EImageFormat computeImageFormatType(string& filename)
{
CCImage::EImageFormat ret = CCImage::kFmtUnKnown;
if ((std::string::npos != filename.find(".jpg")) || (std::string::npos != filename.find(".jpeg")))
{
ret = CCImage::kFmtJpg;
}
else if ((std::string::npos != filename.find(".png")) || (std::string::npos != filename.find(".PNG")))
{
ret = CCImage::kFmtPng;
}
return ret;
}
static void* loadImage(void* data) static void* loadImage(void* data)
{ {
// create autorelease pool for iOS // create autorelease pool for iOS
@ -98,40 +114,24 @@ static void* loadImage(void* data)
const char *filename = pAsyncStruct->filename.c_str(); const char *filename = pAsyncStruct->filename.c_str();
CCLOG("thread 0x%x is loading image %s", pthread_self(), filename); // compute image type
CCImage::EImageFormat imageType = computeImageFormatType(pAsyncStruct->filename);
// generate image if (imageType == CCImage::kFmtUnKnown)
CCImage *pImage = NULL;
CCImage::EImageFormat imageType;
if (std::string::npos != pAsyncStruct->filename.find(".jpg") || std::string::npos != pAsyncStruct->filename.find(".jpeg"))
{
pImage = new CCImage();
if (!pImage->initWithImageFileThreadSafe(filename, cocos2d::CCImage::kFmtJpg))
{
delete pImage;
CCLOG("can not load %s", filename);
imageType = CCImage::kFmtJpg;
continue;
}
}
else if (std::string::npos != pAsyncStruct->filename.find(".png"))
{
pImage = new CCImage();
if (! pImage->initWithImageFileThreadSafe(filename, cocos2d::CCImage::kFmtPng))
{
delete pImage;
CCLOG("can not load %s", filename);
imageType = CCImage::kFmtPng;
continue;
}
}
else
{ {
CCLOG("unsupportted format %s",filename); CCLOG("unsupportted format %s",filename);
delete pAsyncStruct; delete pAsyncStruct;
continue; continue;
} }
// generate image
CCImage *pImage = new CCImage();
if (! pImage->initWithImageFileThreadSafe(filename, imageType))
{
delete pImage;
CCLOG("can not load %s", filename);
continue;
}
// generate image info // generate image info
ImageInfo *pImageInfo = new ImageInfo(); ImageInfo *pImageInfo = new ImageInfo();