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

The real cause of the problem for the texture corruption was when using textures with no alpha. 

The function bitsPerPixelForFormat returns the wrong number for RGB_888.
This commit is contained in:
silverscania 2013-05-19 18:53:59 +03:00
parent 5adb4bc895
commit 1d23f1a2b4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos2dx/textures/CCTexture2D.cpp
View File

@ -174,18 +174,28 @@ bool CCTexture2D::hasPremultipliedAlpha()
bool CCTexture2D::initWithData(const void *data, CCTexture2DPixelFormat pixelFormat, unsigned int pixelsWide, unsigned int pixelsHigh, const CCSize& contentSize) bool CCTexture2D::initWithData(const void *data, CCTexture2DPixelFormat pixelFormat, unsigned int pixelsWide, unsigned int pixelsHigh, const CCSize& contentSize)
{ {
unsigned int bytesPerRow = pixelsWide * bitsPerPixelForFormat(pixelFormat) / 8; unsigned int bitsPerPixel;
bool powerOf2 = ccNextPOT(pixelsWide) == pixelsWide; //Hack: bitsPerPixelForFormat returns wrong number for RGB_888 textures. See function.
if(pixelFormat == kCCTexture2DPixelFormat_RGB888)
{
bitsPerPixel = 24;
}
else
{
bitsPerPixel = bitsPerPixelForFormat(pixelFormat);
}
if(bytesPerRow % 8 == 0 && powerOf2) unsigned int bytesPerRow = pixelsWide * bitsPerPixel / 8;
if(bytesPerRow % 8 == 0)
{ {
glPixelStorei(GL_UNPACK_ALIGNMENT, 8); glPixelStorei(GL_UNPACK_ALIGNMENT, 8);
} }
else if(bytesPerRow % 4 == 0 && powerOf2) else if(bytesPerRow % 4 == 0)
{ {
glPixelStorei(GL_UNPACK_ALIGNMENT, 4); glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
} }
else if(bytesPerRow % 2 == 0 && powerOf2) else if(bytesPerRow % 2 == 0)
{ {
glPixelStorei(GL_UNPACK_ALIGNMENT, 2); glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
} }