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

issue #3812: remove member variable _lastCommand

This commit is contained in:
Huabing.Xu 2014-01-22 16:03:04 +08:00
parent 5bbd48a9bf
commit 7ea9a4f025
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cocos/2d/renderer/CCRenderer.cpp
View File

@ -100,7 +100,6 @@ void RenderQueue::clear()
Renderer::Renderer() Renderer::Renderer()
:_lastMaterialID(0) :_lastMaterialID(0)
,_lastCommand(0)
,_numQuads(0) ,_numQuads(0)
,_glViewAssigned(false) ,_glViewAssigned(false)
#if CC_ENABLE_CACHE_TEXTURE_DATA #if CC_ENABLE_CACHE_TEXTURE_DATA
@ -281,13 +280,10 @@ void Renderer::render()
RenderQueue currRenderQueue = _renderGroups[_renderStack.top().renderQueueID]; RenderQueue currRenderQueue = _renderGroups[_renderStack.top().renderQueueID];
size_t len = currRenderQueue.size(); size_t len = currRenderQueue.size();
//Refresh the batch command index in case the renderStack has changed.
_lastCommand = _renderStack.top().currentIndex;
//Process RenderQueue //Process RenderQueue
for(size_t i = _renderStack.top().currentIndex; i < len; i++) for(size_t i = _renderStack.top().currentIndex; i < len; i++)
{ {
_renderStack.top().currentIndex = _lastCommand = i; _renderStack.top().currentIndex = i;
auto command = currRenderQueue[i]; auto command = currRenderQueue[i];
auto commandType = command->getType(); auto commandType = command->getType();
@ -303,9 +299,7 @@ void Renderer::render()
CCASSERT(cmd->getQuadCount()>= 0 && cmd->getQuadCount() < VBO_SIZE, "VBO is not big enough for quad data, please break the quad data down or use customized render command"); CCASSERT(cmd->getQuadCount()>= 0 && cmd->getQuadCount() < VBO_SIZE, "VBO is not big enough for quad data, please break the quad data down or use customized render command");
//Draw batched quads if VBO is full //Draw batched quads if VBO is full
_lastCommand --;
drawBatchedQuads(); drawBatchedQuads();
_lastCommand ++;
} }
_batchedQuadCommands.push_back(cmd); _batchedQuadCommands.push_back(cmd);
@ -378,7 +372,6 @@ void Renderer::render()
} }
RenderStackElement element = {DEFAULT_RENDER_QUEUE, 0}; RenderStackElement element = {DEFAULT_RENDER_QUEUE, 0};
_renderStack.push(element); _renderStack.push(element);
_lastCommand = 0;
_lastMaterialID = 0; _lastMaterialID = 0;
} }

2
cocos/2d/renderer/CCRenderer.h
View File

@ -109,8 +109,6 @@ protected:
uint32_t _lastMaterialID; uint32_t _lastMaterialID;
ssize_t _lastCommand;
std::vector<QuadCommand*> _batchedQuadCommands; std::vector<QuadCommand*> _batchedQuadCommands;
V3F_C4B_T2F_Quad _quads[VBO_SIZE]; V3F_C4B_T2F_Quad _quads[VBO_SIZE];