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

issue #1686:synchronize CCTexturePVR.cpp

This commit is contained in:
minggo 2013-02-26 18:08:51 +08:00
parent 9d07778bb0
commit 0ffb506607
3 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cocos2dx/textures/CCTexturePVR.cpp
View File

@ -76,22 +76,26 @@ static const ccPVRTexturePixelFormatInfo PVRTableFormats[] = {
#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #endif // (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
}; };
struct _pixelformat_hash { struct _pixel_formathash {
uint64_t pixelFormat; uint64_t pixelFormat;
const ccPVRTexturePixelFormatInfo * pixelFormatInfo; const ccPVRTexturePixelFormatInfo * pixelFormatInfo;
}; };
// Values taken from PVRTexture.h from http://www.imgtec.com // Values taken from PVRTexture.h from http://www.imgtec.com
enum { enum {
kPVRTextureFlagMipmap = (1<<8), // has mip map levels kPVR2TextureFlagMipmap = (1<<8), // has mip map levels
kPVRTextureFlagTwiddle = (1<<9), // is twiddled kPVR2TextureFlagTwiddle = (1<<9), // is twiddled
kPVRTextureFlagBumpmap = (1<<10), // has normals encoded for a bump map kPVR2TextureFlagBumpmap = (1<<10), // has normals encoded for a bump map
kPVRTextureFlagTiling = (1<<11), // is bordered for tiled pvr kPVR2TextureFlagTiling = (1<<11), // is bordered for tiled pvr
kPVRTextureFlagCubemap = (1<<12), // is a cubemap/skybox kPVR2TextureFlagCubemap = (1<<12), // is a cubemap/skybox
kPVRTextureFlagFalseMipCol = (1<<13), // are there false colored MIP levels kPVR2TextureFlagFalseMipCol = (1<<13), // are there false colored MIP levels
kPVRTextureFlagVolume = (1<<14), // is this a volume texture kPVR2TextureFlagVolume = (1<<14), // is this a volume texture
kPVRTextureFlagAlpha = (1<<15), // v2.1 is there transparency info in the texture kPVR2TextureFlagAlpha = (1<<15), // v2.1 is there transparency info in the texture
kPVRTextureFlagVerticalFlip = (1<<16), // v2.1 is the texture vertically flipped kPVR2TextureFlagVerticalFlip = (1<<16), // v2.1 is the texture vertically flipped
};
enum {
kPVR3TextureFlagPremultipliedAlpha = (1<<1) // has premultiplied alpha
}; };
static char gPVRTexIdentifier[5] = "PVR!"; static char gPVRTexIdentifier[5] = "PVR!";
@ -133,7 +137,7 @@ typedef enum
// v2 // v2
static struct _pixelformat_hash v2_pixelformat_hash[] = { static struct _pixel_formathash v2_pixel_formathash[] = {
{ kPVR2TexturePixelFormat_BGRA_8888, &PVRTableFormats[0] }, { kPVR2TexturePixelFormat_BGRA_8888, &PVRTableFormats[0] },
{ kPVR2TexturePixelFormat_RGBA_8888, &PVRTableFormats[1] }, { kPVR2TexturePixelFormat_RGBA_8888, &PVRTableFormats[1] },
@ -151,10 +155,10 @@ static struct _pixelformat_hash v2_pixelformat_hash[] = {
#endif // iphone only #endif // iphone only
}; };
#define PVR2_MAX_TABLE_ELEMENTS (sizeof(v2_pixelformat_hash) / sizeof(v2_pixelformat_hash[0])) #define PVR2_MAX_TABLE_ELEMENTS (sizeof(v2_pixel_formathash) / sizeof(v2_pixel_formathash[0]))
// v3 // v3
struct _pixelformat_hash v3_pixelformat_hash[] = { struct _pixel_formathash v3_pixel_formathash[] = {
{kPVR3TexturePixelFormat_BGRA_8888, &PVRTableFormats[0] }, {kPVR3TexturePixelFormat_BGRA_8888, &PVRTableFormats[0] },
{kPVR3TexturePixelFormat_RGBA_8888, &PVRTableFormats[1] }, {kPVR3TexturePixelFormat_RGBA_8888, &PVRTableFormats[1] },
@ -176,7 +180,7 @@ struct _pixelformat_hash v3_pixelformat_hash[] = {
//Tells How large is tableFormats //Tells How large is tableFormats
#define PVR3_MAX_TABLE_ELEMENTS (sizeof(v3_pixelformat_hash) / sizeof(v3_pixelformat_hash[0])) #define PVR3_MAX_TABLE_ELEMENTS (sizeof(v3_pixel_formathash) / sizeof(v3_pixel_formathash[0]))
typedef struct _PVRTexHeader typedef struct _PVRTexHeader
@ -229,6 +233,8 @@ CCTexturePVR::CCTexturePVR()
, m_bHasAlpha(false) , m_bHasAlpha(false)
, m_uName(0) , m_uName(0)
, m_eFormat(kCCTexture2DPixelFormat_Default) , m_eFormat(kCCTexture2DPixelFormat_Default)
, m_bHasPremultipliedAlpha(false)
, m_bForcePremultipliedAlpha(false)
{ {
} }
@ -271,7 +277,7 @@ bool CCTexturePVR::unpackPVRv2Data(unsigned char* data, unsigned int len)
flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags);
formatFlags = flags & PVR_TEXTURE_FLAG_TYPE_MASK; formatFlags = flags & PVR_TEXTURE_FLAG_TYPE_MASK;
bool flipped = (flags & kPVRTextureFlagVerticalFlip) ? true : false; bool flipped = (flags & kPVR2TextureFlagVerticalFlip) ? true : false;
if (flipped) if (flipped)
{ {
CCLOG("cocos2d: WARNING: Image is flipped. Regenerate it using PVRTexTool"); CCLOG("cocos2d: WARNING: Image is flipped. Regenerate it using PVRTexTool");
@ -287,9 +293,9 @@ bool CCTexturePVR::unpackPVRv2Data(unsigned char* data, unsigned int len)
for (unsigned int i = 0; i < (unsigned int)PVR2_MAX_TABLE_ELEMENTS; i++) for (unsigned int i = 0; i < (unsigned int)PVR2_MAX_TABLE_ELEMENTS; i++)
{ {
//Does image format in table fits to the one parsed from header? //Does image format in table fits to the one parsed from header?
if (v2_pixelformat_hash[i].pixelFormat == formatFlags) if (v2_pixel_formathash[i].pixelFormat == formatFlags)
{ {
m_pPixelFormatInfo = v2_pixelformat_hash[i].pixelFormatInfo; m_pPixelFormatInfo = v2_pixel_formathash[i].pixelFormatInfo;
//Reset num of mipmaps //Reset num of mipmaps
m_uNumberOfMipmaps = 0; m_uNumberOfMipmaps = 0;
@ -411,9 +417,9 @@ bool CCTexturePVR::unpackPVRv3Data(unsigned char* dataPointer, unsigned int data
for(int i = 0; i < PVR3_MAX_TABLE_ELEMENTS; i++) for(int i = 0; i < PVR3_MAX_TABLE_ELEMENTS; i++)
{ {
if( v3_pixelformat_hash[i].pixelFormat == pixelFormat ) if( v3_pixel_formathash[i].pixelFormat == pixelFormat )
{ {
m_pPixelFormatInfo = v3_pixelformat_hash[i].pixelFormatInfo; m_pPixelFormatInfo = v3_pixel_formathash[i].pixelFormatInfo;
m_bHasAlpha = m_pPixelFormatInfo->alpha; m_bHasAlpha = m_pPixelFormatInfo->alpha;
infoValid = true; infoValid = true;
break; break;
@ -427,6 +433,16 @@ bool CCTexturePVR::unpackPVRv3Data(unsigned char* dataPointer, unsigned int data
return false; return false;
} }
// flags
uint32_t flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags);
// PVRv3 specifies premultiply alpha in a flag -- should always respect this in PVRv3 files
m_bForcePremultipliedAlpha = true;
if (flags & kPVR3TextureFlagPremultipliedAlpha)
{
m_bHasPremultipliedAlpha = true;
}
// sizing // sizing
uint32_t width = CC_SWAP_INT32_LITTLE_TO_HOST(header->width); uint32_t width = CC_SWAP_INT32_LITTLE_TO_HOST(header->width);
uint32_t height = CC_SWAP_INT32_LITTLE_TO_HOST(header->height); uint32_t height = CC_SWAP_INT32_LITTLE_TO_HOST(header->height);
@ -617,6 +633,8 @@ bool CCTexturePVR::initWithContentsOfFile(const char* path)
m_uWidth = m_uHeight = 0; m_uWidth = m_uHeight = 0;
m_pPixelFormatInfo = NULL; m_pPixelFormatInfo = NULL;
m_bHasAlpha = false; m_bHasAlpha = false;
m_bForcePremultipliedAlpha = false;
m_bHasPremultipliedAlpha = false;
m_bRetainName = false; // cocos2d integration m_bRetainName = false; // cocos2d integration

11
cocos2dx/textures/CCTexturePVR.h
View File

@ -101,10 +101,19 @@ public:
// properties // properties
/** texture id name */
inline unsigned int getName() { return m_uName; } inline unsigned int getName() { return m_uName; }
/** texture width */
inline unsigned int getWidth() { return m_uWidth; } inline unsigned int getWidth() { return m_uWidth; }
/** texture height */
inline unsigned int getHeight() { return m_uHeight; } inline unsigned int getHeight() { return m_uHeight; }
/** whether or not the texture has alpha */
inline bool hasAlpha() { return m_bHasAlpha; } inline bool hasAlpha() { return m_bHasAlpha; }
/** whether or not the texture has premultiplied alpha */
inline bool hasPremultipliedAlpha() { return m_bHasPremultipliedAlpha; }
/** whether or not the texture should use hasPremultipliedAlpha instead of global default */
inline bool isForcePremultipliedAlpha() { return m_bForcePremultipliedAlpha; }
/** how many mipmaps the texture has. 1 means one level (level 0 */
inline unsigned int getNumberOfMipmaps() { return m_uNumberOfMipmaps; } inline unsigned int getNumberOfMipmaps() { return m_uNumberOfMipmaps; }
inline CCTexture2DPixelFormat getFormat() { return m_eFormat; } inline CCTexture2DPixelFormat getFormat() { return m_eFormat; }
inline bool isRetainName() { return m_bRetainName; } inline bool isRetainName() { return m_bRetainName; }
@ -122,6 +131,8 @@ protected:
unsigned int m_uWidth, m_uHeight; unsigned int m_uWidth, m_uHeight;
GLuint m_uName; GLuint m_uName;
bool m_bHasAlpha; bool m_bHasAlpha;
bool m_bHasPremultipliedAlpha;
bool m_bForcePremultipliedAlpha;
// cocos2d integration // cocos2d integration
bool m_bRetainName; bool m_bRetainName;

10
cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.cpp
View File

@ -135,11 +135,11 @@ void CCTileMapAtlas::loadTGAfile(const char *file)
// CCTileMapAtlas - Atlas generation / updates // CCTileMapAtlas - Atlas generation / updates
void CCTileMapAtlas::setTile(const ccColor3B& tile, const CCPoint& position) void CCTileMapAtlas::setTile(const ccColor3B& tile, const CCPoint& position)
{ {
CCAssert( m_pTGAInfo != NULL, "tgaInfo must not be nil"); CCAssert(m_pTGAInfo != NULL, "tgaInfo must not be nil");
CCAssert( m_pPosToAtlasIndex != NULL, "posToAtlasIndex must not be nil"); CCAssert(m_pPosToAtlasIndex != NULL, "posToAtlasIndex must not be nil");
CCAssert( position.x < m_pTGAInfo->width, "Invalid position.x"); CCAssert(position.x < m_pTGAInfo->width, "Invalid position.x");
CCAssert( position.y < m_pTGAInfo->height, "Invalid position.x"); CCAssert(position.y < m_pTGAInfo->height, "Invalid position.x");
CCAssert( tile.r != 0, "R component must be non 0"); CCAssert(tile.r != 0, "R component must be non 0");
ccColor3B *ptr = (ccColor3B*)m_pTGAInfo->imageData; ccColor3B *ptr = (ccColor3B*)m_pTGAInfo->imageData;
ccColor3B value = ptr[(unsigned int)(position.x + position.y * m_pTGAInfo->width)]; ccColor3B value = ptr[(unsigned int)(position.x + position.y * m_pTGAInfo->width)];