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

Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer

This commit is contained in:
Ricardo Quesada 2013-12-06 11:57:19 -08:00
parent 745541979b 3e0bee706e
commit 439adafbcd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCLabelAtlas.cpp
View File

@ -169,8 +169,7 @@ void LabelAtlas::updateAtlasValues()
quads[i].tr.vertices.x = (float)(i * _itemWidth + _itemWidth); quads[i].tr.vertices.x = (float)(i * _itemWidth + _itemWidth);
quads[i].tr.vertices.y = (float)(_itemHeight); quads[i].tr.vertices.y = (float)(_itemHeight);
quads[i].tr.vertices.z = 0.0f; quads[i].tr.vertices.z = 0.0f;
// Color4B c(_displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity); Color4B c(_displayedColor.r, _displayedColor.g, _displayedColor.b, _displayedOpacity);
Color4B c(255,255,255,255);
quads[i].tl.colors = c; quads[i].tl.colors = c;
quads[i].tr.colors = c; quads[i].tr.colors = c;
quads[i].bl.colors = c; quads[i].bl.colors = c;

1
cocos/2d/renderer/QuadCommand.cpp
View File

@ -33,6 +33,7 @@ void QuadCommand::init(int viewport, int32_t depth, GLuint textureID, GLProgram*
_shader = shader; _shader = shader;
if(quadCount > _capacity ) { if(quadCount > _capacity ) {
//TODO find a better way to manage quads, current way will result in memory be wasted
// _quad = (V3F_C4B_T2F_Quad*)malloc(sizeof(V3F_C4B_T2F_Quad) * quadCount); // _quad = (V3F_C4B_T2F_Quad*)malloc(sizeof(V3F_C4B_T2F_Quad) * quadCount);
_quad = (V3F_C4B_T2F_Quad*) realloc(_quad, sizeof(*quad) * quadCount ); _quad = (V3F_C4B_T2F_Quad*) realloc(_quad, sizeof(*quad) * quadCount );
_capacity = quadCount; _capacity = quadCount;