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

fix some format problem

This commit is contained in:
Huabing.Xu 2014-10-16 14:56:17 +08:00
parent 93ea1b9078
commit 90030140d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/renderer/CCQuadCommand.h
View File

@ -67,4 +67,4 @@ protected:
NS_CC_END NS_CC_END
#endif //_CC_QUADCOMMAND_H_ #endif //_CC_QUADCOMMAND_H_

6
cocos/renderer/CCRenderer.cpp
View File

@ -363,7 +363,7 @@ void Renderer::visitRenderQueue(const RenderQueue& queue)
} }
auto cmd = static_cast<TrianglesCommand*>(command); auto cmd = static_cast<TrianglesCommand*>(command);
//Batch quads //Batch Triangles
if( _filledVertex + cmd->getVertexCount() > VBO_SIZE || _filledIndex + cmd->getIndexCount() > INDEX_VBO_SIZE) if( _filledVertex + cmd->getVertexCount() > VBO_SIZE || _filledIndex + cmd->getIndexCount() > INDEX_VBO_SIZE)
{ {
CCASSERT(cmd->getVertexCount()>= 0 && cmd->getVertexCount() < VBO_SIZE, "VBO for vertex is not big enough, please break the data down or use customized render command"); CCASSERT(cmd->getVertexCount()>= 0 && cmd->getVertexCount() < VBO_SIZE, "VBO for vertex is not big enough, please break the data down or use customized render command");
@ -551,7 +551,7 @@ void Renderer::clean()
_renderGroups[j].clear(); _renderGroups[j].clear();
} }
// Clear batch quad commands // Clear batch commands
_batchedCommands.clear(); _batchedCommands.clear();
_batchQuadCommands.clear(); _batchQuadCommands.clear();
_filledVertex = 0; _filledVertex = 0;
@ -686,7 +686,7 @@ void Renderer::drawBatchedTriangles()
indexToDraw += cmd->getIndexCount(); indexToDraw += cmd->getIndexCount();
} }
//Draw any remaining quad //Draw any remaining triangles
if(indexToDraw > 0) if(indexToDraw > 0)
{ {
glDrawElements(GL_TRIANGLES, (GLsizei) indexToDraw, GL_UNSIGNED_SHORT, (GLvoid*) (startIndex*sizeof(_indices[0])) ); glDrawElements(GL_TRIANGLES, (GLsizei) indexToDraw, GL_UNSIGNED_SHORT, (GLvoid*) (startIndex*sizeof(_indices[0])) );