summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/mobileopengl2graphics.cpp28
-rw-r--r--src/render/mobileopenglgraphics.cpp20
-rw-r--r--src/render/modernopenglgraphics.cpp28
-rw-r--r--src/render/normalopenglgraphics.cpp26
-rw-r--r--src/render/nullopenglgraphics.cpp26
-rw-r--r--src/render/vertexes/imagevertexes.h4
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.cpp8
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.h22
8 files changed, 81 insertions, 81 deletions
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 1b532e48d..919eb67fe 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -604,11 +604,11 @@ inline void MobileOpenGL2Graphics::drawVertexes(const
OpenGLGraphicsVertexes &
restrict ogl) restrict2
{
- const std::vector<int> &vp = ogl.mVp;
- const std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<int>::const_iterator ivp;
- std::vector<GLuint>::const_iterator ivbo;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ const STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<int>::const_iterator ivp;
+ STD_VECTOR<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
for (ivp = vp.begin(), ivbo = vbos.begin();
ivp != ivp_end;
@@ -1283,14 +1283,14 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert)
if (vert == nullptr)
return;
OpenGLGraphicsVertexes &ogl = vert->ogl;
- const std::vector<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
- std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
- std::vector<GLfloat*>::const_iterator ft;
- const std::vector<GLfloat*>::const_iterator ft_end = floatTexPool.end();
- std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
+ STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
+ STD_VECTOR<GLfloat*>::const_iterator ft;
+ const STD_VECTOR<GLfloat*>::const_iterator ft_end = floatTexPool.end();
+ STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<GLuint>::const_iterator ivbo;
const int sz = CAST_S32(floatTexPool.size());
vbos.resize(sz);
@@ -1305,7 +1305,7 @@ void MobileOpenGL2Graphics::finalize(ImageVertexes *restrict const vert)
*ft, GL_STATIC_DRAW);
}
- for (std::vector<GLfloat*>::iterator it = floatTexPool.begin();
+ for (STD_VECTOR<GLfloat*>::iterator it = floatTexPool.begin();
it != floatTexPool.end(); ++ it)
{
delete [] (*it);
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index cc1812107..8118e96a4 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -617,19 +617,19 @@ inline void MobileOpenGLGraphics::drawVertexes(const
OpenGLGraphicsVertexes
&restrict ogl) restrict2
{
- const std::vector<GLshort*> &shortVertPool = ogl.mShortVertPool;
- std::vector<GLshort*>::const_iterator iv;
- const std::vector<GLshort*>::const_iterator iv_end = shortVertPool.end();
- const std::vector<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<GLshort*> &shortVertPool = ogl.mShortVertPool;
+ STD_VECTOR<GLshort*>::const_iterator iv;
+ const STD_VECTOR<GLshort*>::const_iterator iv_end = shortVertPool.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
// Draw a set of textured rectangles
// if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D)
{
- const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
- std::vector<GLfloat*>::const_iterator ft;
- const std::vector<GLfloat*>::const_iterator
+ const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
+ STD_VECTOR<GLfloat*>::const_iterator ft;
+ const STD_VECTOR<GLfloat*>::const_iterator
ft_end = floatTexPool.end();
for (iv = shortVertPool.begin(), ft = floatTexPool.begin(),
@@ -818,7 +818,7 @@ void MobileOpenGLGraphics::calcTileVertexesInline(ImageVertexes *
OpenGLGraphicsVertexes &ogl = vert->ogl;
-// std::vector<int> *vps = ogl.getVp();
+// STD_VECTOR<int> *vps = ogl.getVp();
unsigned int vp = ogl.continueVp();
// Draw a set of textured rectangles
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index f034cdc65..6950f4555 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -589,11 +589,11 @@ inline void ModernOpenGLGraphics::drawVertexes(const
OpenGLGraphicsVertexes &
restrict ogl) restrict2
{
- const std::vector<int> &vp = ogl.mVp;
- const std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<int>::const_iterator ivp;
- std::vector<GLuint>::const_iterator ivbo;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ const STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<int>::const_iterator ivp;
+ STD_VECTOR<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
/*
if (vp.size() != vbos.size())
@@ -1286,14 +1286,14 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert)
if (vert == nullptr)
return;
OpenGLGraphicsVertexes &ogl = vert->ogl;
- const std::vector<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
- std::vector<GLint*> &intTexPool = ogl.mIntTexPool;
- std::vector<GLint*>::const_iterator ft;
- const std::vector<GLint*>::const_iterator ft_end = intTexPool.end();
- std::vector<GLuint> &vbos = ogl.mVbo;
- std::vector<GLuint>::const_iterator ivbo;
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
+ STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool;
+ STD_VECTOR<GLint*>::const_iterator ft;
+ const STD_VECTOR<GLint*>::const_iterator ft_end = intTexPool.end();
+ STD_VECTOR<GLuint> &vbos = ogl.mVbo;
+ STD_VECTOR<GLuint>::const_iterator ivbo;
const int sz = CAST_S32(intTexPool.size());
vbos.resize(sz);
@@ -1316,7 +1316,7 @@ void ModernOpenGLGraphics::finalize(ImageVertexes *restrict const vert)
*ft, GL_STATIC_DRAW);
}
- for (std::vector<GLint*>::iterator it = intTexPool.begin();
+ for (STD_VECTOR<GLint*>::iterator it = intTexPool.begin();
it != intTexPool.end(); ++ it)
{
delete [] (*it);
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 3ed186cdc..a03ae4341 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -913,19 +913,19 @@ inline void NormalOpenGLGraphics::drawVertexes(const
OpenGLGraphicsVertexes
&restrict ogl) restrict2
{
- const std::vector<GLint*> &intVertPool = ogl.mIntVertPool;
- std::vector<GLint*>::const_iterator iv;
- const std::vector<GLint*>::const_iterator iv_end = intVertPool.end();
- const std::vector<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<GLint*> &intVertPool = ogl.mIntVertPool;
+ STD_VECTOR<GLint*>::const_iterator iv;
+ const STD_VECTOR<GLint*>::const_iterator iv_end = intVertPool.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
// Draw a set of textured rectangles
if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D)
{
- const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
- std::vector<GLfloat*>::const_iterator ft;
- const std::vector<GLfloat*>::const_iterator
+ const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
+ STD_VECTOR<GLfloat*>::const_iterator ft;
+ const STD_VECTOR<GLfloat*>::const_iterator
ft_end = floatTexPool.end();
for (iv = intVertPool.begin(), ft = floatTexPool.begin(),
@@ -938,9 +938,9 @@ inline void NormalOpenGLGraphics::drawVertexes(const
}
else
{
- const std::vector<GLint*> &intTexPool = ogl.mIntTexPool;
- std::vector<GLint*>::const_iterator it;
- const std::vector<GLint*>::const_iterator it_end = intTexPool.end();
+ const STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool;
+ STD_VECTOR<GLint*>::const_iterator it;
+ const STD_VECTOR<GLint*>::const_iterator it_end = intTexPool.end();
for (iv = intVertPool.begin(), it = intTexPool.begin(),
ivp = vp.begin();
@@ -1158,7 +1158,7 @@ void NormalOpenGLGraphics::calcTileVertexesInline(ImageVertexes *
OpenGLGraphicsVertexes &ogl = vert->ogl;
-// std::vector<int> *vps = ogl.getVp();
+// STD_VECTOR<int> *vps = ogl.getVp();
unsigned int vp = ogl.continueVp();
// Draw a set of textured rectangles
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index dac86b519..ff4a765bf 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -536,19 +536,19 @@ inline void NullOpenGLGraphics::drawVertexes(const
OpenGLGraphicsVertexes
&restrict ogl) restrict2
{
- const std::vector<GLint*> &intVertPool = ogl.mIntVertPool;
- std::vector<GLint*>::const_iterator iv;
- const std::vector<GLint*>::const_iterator iv_end = intVertPool.end();
- const std::vector<int> &vp = ogl.mVp;
- std::vector<int>::const_iterator ivp;
- const std::vector<int>::const_iterator ivp_end = vp.end();
+ const STD_VECTOR<GLint*> &intVertPool = ogl.mIntVertPool;
+ STD_VECTOR<GLint*>::const_iterator iv;
+ const STD_VECTOR<GLint*>::const_iterator iv_end = intVertPool.end();
+ const STD_VECTOR<int> &vp = ogl.mVp;
+ STD_VECTOR<int>::const_iterator ivp;
+ const STD_VECTOR<int>::const_iterator ivp_end = vp.end();
// Draw a set of textured rectangles
if (OpenGLImageHelper::mTextureType == GL_TEXTURE_2D)
{
- const std::vector<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
- std::vector<GLfloat*>::const_iterator ft;
- const std::vector<GLfloat*>::const_iterator
+ const STD_VECTOR<GLfloat*> &floatTexPool = ogl.mFloatTexPool;
+ STD_VECTOR<GLfloat*>::const_iterator ft;
+ const STD_VECTOR<GLfloat*>::const_iterator
ft_end = floatTexPool.end();
for (iv = intVertPool.begin(), ft = floatTexPool.begin(),
@@ -561,9 +561,9 @@ inline void NullOpenGLGraphics::drawVertexes(const
}
else
{
- const std::vector<GLint*> &intTexPool = ogl.mIntTexPool;
- std::vector<GLint*>::const_iterator it;
- const std::vector<GLint*>::const_iterator it_end = intTexPool.end();
+ const STD_VECTOR<GLint*> &intTexPool = ogl.mIntTexPool;
+ STD_VECTOR<GLint*>::const_iterator it;
+ const STD_VECTOR<GLint*>::const_iterator it_end = intTexPool.end();
for (iv = intVertPool.begin(), it = intTexPool.begin(),
ivp = vp.begin();
@@ -815,7 +815,7 @@ void NullOpenGLGraphics::calcTileVertexesInline(ImageVertexes *
OpenGLGraphicsVertexes &ogl = vert->ogl;
-// std::vector<int> *vps = ogl.getVp();
+// STD_VECTOR<int> *vps = ogl.getVp();
unsigned int vp = ogl.continueVp();
// Draw a set of textured rectangles
diff --git a/src/render/vertexes/imagevertexes.h b/src/render/vertexes/imagevertexes.h
index 3a852f429..01390c450 100644
--- a/src/render/vertexes/imagevertexes.h
+++ b/src/render/vertexes/imagevertexes.h
@@ -33,7 +33,7 @@
class Image;
-typedef std::vector<DoubleRect*> DoubleRects;
+typedef STD_VECTOR<DoubleRect*> DoubleRects;
class ImageVertexes final
{
@@ -52,7 +52,7 @@ class ImageVertexes final
DoubleRects sdl;
};
-typedef std::vector<ImageVertexes*> ImageVertexesVector;
+typedef STD_VECTOR<ImageVertexes*> ImageVertexesVector;
typedef ImageVertexesVector::iterator ImageCollectionIter;
typedef ImageVertexesVector::const_iterator ImageCollectionCIter;
diff --git a/src/render/vertexes/openglgraphicsvertexes.cpp b/src/render/vertexes/openglgraphicsvertexes.cpp
index 7d7600ee1..a65f0e2b9 100644
--- a/src/render/vertexes/openglgraphicsvertexes.cpp
+++ b/src/render/vertexes/openglgraphicsvertexes.cpp
@@ -56,28 +56,28 @@ OpenGLGraphicsVertexes::~OpenGLGraphicsVertexes()
void OpenGLGraphicsVertexes::clear() restrict2
{
- for (std::vector<GLfloat*>::iterator it = mFloatTexPool.begin();
+ for (STD_VECTOR<GLfloat*>::iterator it = mFloatTexPool.begin();
it != mFloatTexPool.end(); ++ it)
{
delete [] (*it);
}
mFloatTexPool.clear();
- for (std::vector<GLint*>::iterator it = mIntVertPool.begin();
+ for (STD_VECTOR<GLint*>::iterator it = mIntVertPool.begin();
it != mIntVertPool.end(); ++ it)
{
delete [] (*it);
}
mIntVertPool.clear();
- for (std::vector<GLshort*>::iterator it = mShortVertPool.begin();
+ for (STD_VECTOR<GLshort*>::iterator it = mShortVertPool.begin();
it != mShortVertPool.end(); ++ it)
{
delete [] (*it);
}
mShortVertPool.clear();
- for (std::vector<GLint*>::iterator it = mIntTexPool.begin();
+ for (STD_VECTOR<GLint*>::iterator it = mIntTexPool.begin();
it != mIntTexPool.end(); ++ it)
{
delete [] (*it);
diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h
index dd05c7e1c..023abf139 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -56,16 +56,16 @@ class OpenGLGraphicsVertexes final
GLshort *switchShortVertArray() restrict2;
- std::vector<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLfloat*> *getFloatTexPool() restrict2 A_WARN_UNUSED
{ return &mFloatTexPool; }
- std::vector<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLint*> *getIntVertPool() restrict2 A_WARN_UNUSED
{ return &mIntVertPool; }
- std::vector<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLshort*> *getShortVertPool() restrict2 A_WARN_UNUSED
{ return &mShortVertPool; }
- std::vector<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED
+ STD_VECTOR<GLint*> *getIntTexPool() restrict2 A_WARN_UNUSED
{ return &mIntTexPool; }
void switchVp(const int n) restrict2;
@@ -82,7 +82,7 @@ class OpenGLGraphicsVertexes final
void updateVp(const int n) restrict2;
- std::vector<int> *getVp() restrict2 A_WARN_UNUSED
+ STD_VECTOR<int> *getVp() restrict2 A_WARN_UNUSED
{ return &mVp; }
void init() restrict2;
@@ -95,12 +95,12 @@ class OpenGLGraphicsVertexes final
GLint *mIntTexArray;
GLint *mIntVertArray;
GLshort *mShortVertArray;
- std::vector<int> mVp;
- std::vector<GLfloat*> mFloatTexPool;
- std::vector<GLint*> mIntVertPool;
- std::vector<GLshort*> mShortVertPool;
- std::vector<GLint*> mIntTexPool;
- std::vector<GLuint> mVbo;
+ STD_VECTOR<int> mVp;
+ STD_VECTOR<GLfloat*> mFloatTexPool;
+ STD_VECTOR<GLint*> mIntVertPool;
+ STD_VECTOR<GLshort*> mShortVertPool;
+ STD_VECTOR<GLint*> mIntTexPool;
+ STD_VECTOR<GLuint> mVbo;
};
extern unsigned int vertexBufSize;