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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3

This commit is contained in:
samuele3hu 2014-07-08 14:25:10 +08:00
parent 7095298735 2d20b282a4
commit f7c8674584
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/renderer/CCTexture2D.cpp
View File

@ -711,7 +711,7 @@ std::string Texture2D::getDescription() const
// implementation Texture2D (Image) // implementation Texture2D (Image)
bool Texture2D::initWithImage(Image *image) bool Texture2D::initWithImage(Image *image)
{ {
return initWithImage(image, PixelFormat::NONE); return initWithImage(image, g_defaultAlphaPixelFormat);
} }
bool Texture2D::initWithImage(Image *image, PixelFormat format) bool Texture2D::initWithImage(Image *image, PixelFormat format)
@ -736,14 +736,14 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format)
unsigned char* tempData = image->getData(); unsigned char* tempData = image->getData();
Size imageSize = Size((float)imageWidth, (float)imageHeight); Size imageSize = Size((float)imageWidth, (float)imageHeight);
PixelFormat pixelFormat = PixelFormat::NONE; PixelFormat pixelFormat = ((PixelFormat::NONE == format) || (PixelFormat::AUTO == format)) ? image->getRenderFormat() : format;
PixelFormat renderFormat = image->getRenderFormat(); PixelFormat renderFormat = image->getRenderFormat();
size_t tempDataLen = image->getDataLen(); size_t tempDataLen = image->getDataLen();
if (image->getNumberOfMipmaps() > 1) if (image->getNumberOfMipmaps() > 1)
{ {
if (format != PixelFormat::NONE) if (pixelFormat != image->getRenderFormat())
{ {
CCLOG("cocos2d: WARNING: This image has more than 1 mipmaps and we will not convert the data format"); CCLOG("cocos2d: WARNING: This image has more than 1 mipmaps and we will not convert the data format");
} }
@ -754,7 +754,7 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format)
} }
else if (image->isCompressed()) else if (image->isCompressed())
{ {
if (format != PixelFormat::NONE) if (pixelFormat != image->getRenderFormat())
{ {
CCLOG("cocos2d: WARNING: This image is compressed and we cann't convert it for now"); CCLOG("cocos2d: WARNING: This image is compressed and we cann't convert it for now");
} }
@ -764,15 +764,6 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format)
} }
else else
{ {
// compute pixel format
if (format != PixelFormat::NONE)
{
pixelFormat = format;
}else
{
pixelFormat = g_defaultAlphaPixelFormat;
}
unsigned char* outTempData = nullptr; unsigned char* outTempData = nullptr;
ssize_t outTempDataLen = 0; ssize_t outTempDataLen = 0;