MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Replace QVector, QList with std::vector, std::list

Browse source 
An exception is made of TexPool, which will need a
bit more testing before transitioning to std containers.

Also replace 'int' with 'size_t' where it is used only
as an array index.
This commit is contained in:
Jonas Kulla 2013-12-26 20:18:33 +01:00
parent 8215bc7e7d
commit 231e38ae8e
16 changed files with 188 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/global-ibo.h
View file

@ -23,12 +23,13 @@
#define GLOBALIBO_H
#include "gl-util.h"
#include <QVector>
#include <vector>
struct GlobalIBO
{
IBO::ID ibo;
QVector<uint32_t> buffer;
std::vector<uint32_t> buffer;
GlobalIBO()
{
@ -40,25 +41,24 @@ struct GlobalIBO
IBO::del(ibo);
}
void ensureSize(int quadCount)
void ensureSize(size_t quadCount)
{
if (buffer.size() >= quadCount*6)
return;
int startInd = buffer.size() / 6;
size_t startInd = buffer.size() / 6;
buffer.reserve(quadCount*6);
for (int i = startInd; i < quadCount; ++i)
for (size_t i = startInd; i < quadCount; ++i)
{
static const int indTemp[] = { 0, 1, 2, 2, 3, 0 };
static const uint32_t indTemp[] = { 0, 1, 2, 2, 3, 0 };
for (int j = 0; j < 6; ++j)
buffer.append(i * 4 + indTemp[j]);
for (size_t j = 0; j < 6; ++j)
buffer.push_back(i * 4 + indTemp[j]);
}
IBO::bind(ibo);
IBO::uploadData(buffer.count() * sizeof(int),
buffer.constData());
IBO::uploadData(buffer.size() * sizeof(uint32_t), &buffer[0]);
IBO::unbind();
}
};