diff options
Diffstat (limited to 'src/render/vertexes')
-rw-r--r-- | src/render/vertexes/imagevertexes.h | 4 | ||||
-rw-r--r-- | src/render/vertexes/openglgraphicsvertexes.cpp | 8 | ||||
-rw-r--r-- | src/render/vertexes/openglgraphicsvertexes.h | 22 |
3 files changed, 17 insertions, 17 deletions
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; |