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

remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE

This commit is contained in:
Huabing.Xu 2015-01-28 10:32:22 +08:00
parent 7ae85cb51f
commit 5f5c00b7d2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/renderer/CCRenderer.cpp
View File

@ -92,7 +92,7 @@ void RenderQueue::push_back(RenderCommand* command)
ssize_t RenderQueue::size() const ssize_t RenderQueue::size() const
{ {
ssize_t result(0); ssize_t result(0);
for(int index = 0; index < QUEUE_GROUP::QUEUE_GROUP_SIZE; ++index) for(int index = 0; index < QUEUE_GROUP::QUEUE_COUNT; ++index)
{ {
result += _commands[index].size(); result += _commands[index].size();
} }
@ -110,7 +110,7 @@ void RenderQueue::sort()
RenderCommand* RenderQueue::operator[](ssize_t index) const RenderCommand* RenderQueue::operator[](ssize_t index) const
{ {
for(int queIndex = 0; queIndex < QUEUE_GROUP::QUEUE_GROUP_SIZE; ++queIndex) for(int queIndex = 0; queIndex < QUEUE_GROUP::QUEUE_COUNT; ++queIndex)
{ {
if(index < static_cast<ssize_t>(_commands[queIndex].size())) if(index < static_cast<ssize_t>(_commands[queIndex].size()))
return _commands[queIndex][index]; return _commands[queIndex][index];

3
cocos/renderer/CCRenderer.h
View File

@ -55,8 +55,7 @@ public:
TRANSPARENT_3D = 2, TRANSPARENT_3D = 2,
GLOBALZ_ZERO = 3, GLOBALZ_ZERO = 3,
GLOBALZ_POS = 4, GLOBALZ_POS = 4,
QUEUE_GROUP_SIZE = 5, QUEUE_COUNT = 5,
QUEUE_COUNT,
}; };
public: public: