diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
| commit | 311c175f3184103950c72bc5c775174597430b83 (patch) | |
| tree | ad022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/render/normalopenglgraphics.cpp | |
| parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
| download | manaverse-311c175f3184103950c72bc5c775174597430b83.tar.gz manaverse-311c175f3184103950c72bc5c775174597430b83.tar.bz2 manaverse-311c175f3184103950c72bc5c775174597430b83.tar.xz manaverse-311c175f3184103950c72bc5c775174597430b83.zip | |
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes.
Now it can be also mse::mstd::vector, but sadly this class not support
all required features.
Diffstat (limited to 'src/render/normalopenglgraphics.cpp')
| -rw-r--r-- | src/render/normalopenglgraphics.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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 |