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

Merge pull request #2652 from liuyq/memcpy 

CCTextureAtlas::updateQuad modify for the memcpy hot spot
This commit is contained in:
minggo 2013-05-29 22:58:17 -07:00
parent 038cc86537 1091e71bda
commit 809b020de5
3 changed files with 75 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cocos2dx/label_nodes/CCLabelAtlas.cpp
View File

@ -116,8 +116,6 @@ void CCLabelAtlas::updateAtlasValues()
{ {
unsigned int n = m_sString.length(); unsigned int n = m_sString.length();
ccV3F_C4B_T2F_Quad quad;
const unsigned char *s = (unsigned char*)m_sString.c_str(); const unsigned char *s = (unsigned char*)m_sString.c_str();
CCTexture2D *texture = m_pTextureAtlas->getTexture(); CCTexture2D *texture = m_pTextureAtlas->getTexture();
@ -125,14 +123,17 @@ void CCLabelAtlas::updateAtlasValues()
float textureHigh = (float) texture->getPixelsHigh(); float textureHigh = (float) texture->getPixelsHigh();
float itemWidthInPixels = m_uItemWidth * CC_CONTENT_SCALE_FACTOR(); float itemWidthInPixels = m_uItemWidth * CC_CONTENT_SCALE_FACTOR();
float itemHeightInPixels = m_uItemHeight * CC_CONTENT_SCALE_FACTOR(); float itemHeightInPixels = m_uItemHeight * CC_CONTENT_SCALE_FACTOR();
if (m_bIgnoreContentScaleFactor) if (m_bIgnoreContentScaleFactor)
{ {
itemWidthInPixels = m_uItemWidth; itemWidthInPixels = m_uItemWidth;
itemHeightInPixels = m_uItemHeight; itemHeightInPixels = m_uItemHeight;
} }
unsigned int capacity = m_pTextureAtlas->getCapacity();
CCAssert( n <= capacity, "updateAtlasValues: Invalid String length");
ccV3F_C4B_T2F_Quad* quads = m_pTextureAtlas->getQuads();
for(unsigned int i = 0; i < n; i++) { for(unsigned int i = 0; i < n; i++) {
unsigned char a = s[i] - m_uMapStartChar; unsigned char a = s[i] - m_uMapStartChar;
float row = (float) (a % m_uItemsPerRow); float row = (float) (a % m_uItemsPerRow);
float col = (float) (a / m_uItemsPerRow); float col = (float) (a / m_uItemsPerRow);
@ -150,34 +151,39 @@ void CCLabelAtlas::updateAtlasValues()
float bottom = top + itemHeightInPixels / textureHigh; float bottom = top + itemHeightInPixels / textureHigh;
#endif // ! CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL #endif // ! CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL
quad.tl.texCoords.u = left; quads[i].tl.texCoords.u = left;
quad.tl.texCoords.v = top; quads[i].tl.texCoords.v = top;
quad.tr.texCoords.u = right; quads[i].tr.texCoords.u = right;
quad.tr.texCoords.v = top; quads[i].tr.texCoords.v = top;
quad.bl.texCoords.u = left; quads[i].bl.texCoords.u = left;
quad.bl.texCoords.v = bottom; quads[i].bl.texCoords.v = bottom;
quad.br.texCoords.u = right; quads[i].br.texCoords.u = right;
quad.br.texCoords.v = bottom; quads[i].br.texCoords.v = bottom;
quad.bl.vertices.x = (float) (i * m_uItemWidth); quads[i].bl.vertices.x = (float) (i * m_uItemWidth);
quad.bl.vertices.y = 0; quads[i].bl.vertices.y = 0;
quad.bl.vertices.z = 0.0f; quads[i].bl.vertices.z = 0.0f;
quad.br.vertices.x = (float)(i * m_uItemWidth + m_uItemWidth); quads[i].br.vertices.x = (float)(i * m_uItemWidth + m_uItemWidth);
quad.br.vertices.y = 0; quads[i].br.vertices.y = 0;
quad.br.vertices.z = 0.0f; quads[i].br.vertices.z = 0.0f;
quad.tl.vertices.x = (float)(i * m_uItemWidth); quads[i].tl.vertices.x = (float)(i * m_uItemWidth);
quad.tl.vertices.y = (float)(m_uItemHeight); quads[i].tl.vertices.y = (float)(m_uItemHeight);
quad.tl.vertices.z = 0.0f; quads[i].tl.vertices.z = 0.0f;
quad.tr.vertices.x = (float)(i * m_uItemWidth + m_uItemWidth); quads[i].tr.vertices.x = (float)(i * m_uItemWidth + m_uItemWidth);
quad.tr.vertices.y = (float)(m_uItemHeight); quads[i].tr.vertices.y = (float)(m_uItemHeight);
quad.tr.vertices.z = 0.0f; quads[i].tr.vertices.z = 0.0f;
ccColor4B c = { _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity }; ccColor4B c = { _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity };
quad.tl.colors = c; quads[i].tl.colors = c;
quad.tr.colors = c; quads[i].tr.colors = c;
quad.bl.colors = c; quads[i].bl.colors = c;
quad.br.colors = c; quads[i].br.colors = c;
m_pTextureAtlas->updateQuad(&quad, i); }
if (n > 0 ){
m_pTextureAtlas->setDirty(true);
unsigned int totalQuads = m_pTextureAtlas->getTotalQuads();
if (n > totalQuads) {
m_pTextureAtlas->increaseTotalQuadsWith(n - totalQuads);
}
} }
} }

6
cocos2dx/textures/CCTextureAtlas.h
View File

@ -202,6 +202,12 @@ public:
/** listen the event that coming to foreground on Android /** listen the event that coming to foreground on Android
*/ */
void listenBackToForeground(CCObject *obj); void listenBackToForeground(CCObject *obj);
/** whether or not the array buffer of the VBO needs to be updated*/
inline bool isDirty(void) { return m_bDirty; }
/** specify if the array buffer of the VBO needs to be updated */
inline void setDirty(bool bDirty) { m_bDirty = bDirty; }
private: private:
void setupIndices(); void setupIndices();
void mapBuffers(); void mapBuffers();

59
cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.cpp
View File

@ -173,7 +173,10 @@ ccColor3B CCTileMapAtlas::tileAt(const CCPoint& position)
void CCTileMapAtlas::updateAtlasValueAt(const CCPoint& pos, const ccColor3B& value, unsigned int index) void CCTileMapAtlas::updateAtlasValueAt(const CCPoint& pos, const ccColor3B& value, unsigned int index)
{ {
ccV3F_C4B_T2F_Quad quad; unsigned int capacity = m_pTextureAtlas->getCapacity();
CCAssert( index >= 0 && index < capacity, "updateAtlasValueAt: Invalid index");
ccV3F_C4B_T2F_Quad* quad = &((m_pTextureAtlas->getQuads())[index]);
int x = pos.x; int x = pos.x;
int y = pos.y; int y = pos.y;
@ -198,35 +201,39 @@ void CCTileMapAtlas::updateAtlasValueAt(const CCPoint& pos, const ccColor3B& val
float bottom = top + itemHeightInPixels / textureHigh; float bottom = top + itemHeightInPixels / textureHigh;
#endif #endif
quad.tl.texCoords.u = left; quad->tl.texCoords.u = left;
quad.tl.texCoords.v = top; quad->tl.texCoords.v = top;
quad.tr.texCoords.u = right; quad->tr.texCoords.u = right;
quad.tr.texCoords.v = top; quad->tr.texCoords.v = top;
quad.bl.texCoords.u = left; quad->bl.texCoords.u = left;
quad.bl.texCoords.v = bottom; quad->bl.texCoords.v = bottom;
quad.br.texCoords.u = right; quad->br.texCoords.u = right;
quad.br.texCoords.v = bottom; quad->br.texCoords.v = bottom;
quad.bl.vertices.x = (float) (x * m_uItemWidth); quad->bl.vertices.x = (float) (x * m_uItemWidth);
quad.bl.vertices.y = (float) (y * m_uItemHeight); quad->bl.vertices.y = (float) (y * m_uItemHeight);
quad.bl.vertices.z = 0.0f; quad->bl.vertices.z = 0.0f;
quad.br.vertices.x = (float)(x * m_uItemWidth + m_uItemWidth); quad->br.vertices.x = (float)(x * m_uItemWidth + m_uItemWidth);
quad.br.vertices.y = (float)(y * m_uItemHeight); quad->br.vertices.y = (float)(y * m_uItemHeight);
quad.br.vertices.z = 0.0f; quad->br.vertices.z = 0.0f;
quad.tl.vertices.x = (float)(x * m_uItemWidth); quad->tl.vertices.x = (float)(x * m_uItemWidth);
quad.tl.vertices.y = (float)(y * m_uItemHeight + m_uItemHeight); quad->tl.vertices.y = (float)(y * m_uItemHeight + m_uItemHeight);
quad.tl.vertices.z = 0.0f; quad->tl.vertices.z = 0.0f;
quad.tr.vertices.x = (float)(x * m_uItemWidth + m_uItemWidth); quad->tr.vertices.x = (float)(x * m_uItemWidth + m_uItemWidth);
quad.tr.vertices.y = (float)(y * m_uItemHeight + m_uItemHeight); quad->tr.vertices.y = (float)(y * m_uItemHeight + m_uItemHeight);
quad.tr.vertices.z = 0.0f; quad->tr.vertices.z = 0.0f;
ccColor4B color = { _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity }; ccColor4B color = { _displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity };
quad.tr.colors = color; quad->tr.colors = color;
quad.tl.colors = color; quad->tl.colors = color;
quad.br.colors = color; quad->br.colors = color;
quad.bl.colors = color; quad->bl.colors = color;
m_pTextureAtlas->updateQuad(&quad, index); m_pTextureAtlas->setDirty(true);
unsigned int totalQuads = m_pTextureAtlas->getTotalQuads();
if (index + 1 > totalQuads) {
m_pTextureAtlas->increaseTotalQuadsWith(index + 1 - totalQuads);
}
} }
void CCTileMapAtlas::updateAtlasValues() void CCTileMapAtlas::updateAtlasValues()