Rename NormalOpenGLGraphicsVertexes into OpenGLGraphicsVertexes.

11 files changed, 36 insertions, 36 deletions

diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp
index f15a16d9a..7b3e66f98 100644
--- a/src/graphicsvertexes.cpp
+++ b/src/graphicsvertexes.cpp
@@ -40,7 +40,7 @@ SDLGraphicsVertexes::~SDLGraphicsVertexes()
 }
 
 #ifdef USE_OPENGL
-NormalOpenGLGraphicsVertexes::NormalOpenGLGraphicsVertexes() :
+OpenGLGraphicsVertexes::OpenGLGraphicsVertexes() :
     ptr(0),
     mFloatTexArray(nullptr),
     mIntTexArray(nullptr),
@@ -59,12 +59,12 @@ NormalOpenGLGraphicsVertexes::NormalOpenGLGraphicsVertexes() :
     mVp.reserve(30);
 }
 
-NormalOpenGLGraphicsVertexes::~NormalOpenGLGraphicsVertexes()
+OpenGLGraphicsVertexes::~OpenGLGraphicsVertexes()
 {
     clear();
 }
 
-void NormalOpenGLGraphicsVertexes::clear()
+void OpenGLGraphicsVertexes::clear()
 {
     for (std::vector<GLfloat*>::iterator it = mFloatTexPool.begin();
         it != mFloatTexPool.end(); ++ it)
@@ -109,45 +109,45 @@ void NormalOpenGLGraphicsVertexes::clear()
     }
 }
 
-void NormalOpenGLGraphicsVertexes::init()
+void OpenGLGraphicsVertexes::init()
 {
     clear();
 }
 
-GLfloat *NormalOpenGLGraphicsVertexes::switchFloatTexArray()
+GLfloat *OpenGLGraphicsVertexes::switchFloatTexArray()
 {
     mFloatTexArray = new GLfloat[static_cast<size_t>(vertexBufSize * 4 + 30)];
     mFloatTexPool.push_back(mFloatTexArray);
     return mFloatTexArray;
 }
 
-GLint *NormalOpenGLGraphicsVertexes::switchIntVertArray()
+GLint *OpenGLGraphicsVertexes::switchIntVertArray()
 {
     mIntVertArray = new GLint[static_cast<size_t>(vertexBufSize * 4 + 30)];
     mIntVertPool.push_back(mIntVertArray);
     return mIntVertArray;
 }
 
-GLshort *NormalOpenGLGraphicsVertexes::switchShortVertArray()
+GLshort *OpenGLGraphicsVertexes::switchShortVertArray()
 {
     mShortVertArray = new GLshort[static_cast<size_t>(vertexBufSize * 4 + 30)];
     mShortVertPool.push_back(mShortVertArray);
     return mShortVertArray;
 }
 
-GLint *NormalOpenGLGraphicsVertexes::switchIntTexArray()
+GLint *OpenGLGraphicsVertexes::switchIntTexArray()
 {
     mIntTexArray = new GLint[static_cast<size_t>(vertexBufSize * 4 + 30)];
     mIntTexPool.push_back(mIntTexArray);
     return mIntTexArray;
 }
 
-void NormalOpenGLGraphicsVertexes::switchVp(const int n)
+void OpenGLGraphicsVertexes::switchVp(const int n)
 {
     mVp.push_back(n);
 }
 
-int NormalOpenGLGraphicsVertexes::continueVp()
+int OpenGLGraphicsVertexes::continueVp()
 {
     if (mVp.empty())
     {
@@ -161,14 +161,14 @@ int NormalOpenGLGraphicsVertexes::continueVp()
     }
 }
 
-void NormalOpenGLGraphicsVertexes::updateVp(const int n)
+void OpenGLGraphicsVertexes::updateVp(const int n)
 {
     if (!mVp.empty())
         mVp.pop_back();
     mVp.push_back(n);
 }
 
-GLfloat *NormalOpenGLGraphicsVertexes::continueFloatTexArray()
+GLfloat *OpenGLGraphicsVertexes::continueFloatTexArray()
 {
     if (mFloatTexPool.empty())
     {
@@ -183,7 +183,7 @@ GLfloat *NormalOpenGLGraphicsVertexes::continueFloatTexArray()
     return mFloatTexArray;
 }
 
-GLint *NormalOpenGLGraphicsVertexes::continueIntVertArray()
+GLint *OpenGLGraphicsVertexes::continueIntVertArray()
 {
     if (mIntVertPool.empty())
     {
@@ -197,7 +197,7 @@ GLint *NormalOpenGLGraphicsVertexes::continueIntVertArray()
     return mIntVertArray;
 }
 
-GLshort *NormalOpenGLGraphicsVertexes::continueShortVertArray()
+GLshort *OpenGLGraphicsVertexes::continueShortVertArray()
 {
     if (mShortVertPool.empty())
     {
@@ -212,7 +212,7 @@ GLshort *NormalOpenGLGraphicsVertexes::continueShortVertArray()
     return mShortVertArray;
 }
 
-GLint *NormalOpenGLGraphicsVertexes::continueIntTexArray()
+GLint *OpenGLGraphicsVertexes::continueIntTexArray()
 {
     if (mIntTexPool.empty())
     {
diff --git a/src/graphicsvertexes.h b/src/graphicsvertexes.h
index 8746bcce3..84597ad73 100644
--- a/src/graphicsvertexes.h
+++ b/src/graphicsvertexes.h
@@ -63,14 +63,14 @@ class SDLGraphicsVertexes final
 };
 
 #ifdef USE_OPENGL
-class NormalOpenGLGraphicsVertexes final
+class OpenGLGraphicsVertexes final
 {
     public:
-        NormalOpenGLGraphicsVertexes();
+        OpenGLGraphicsVertexes();
 
-        A_DELETE_COPY(NormalOpenGLGraphicsVertexes)
+        A_DELETE_COPY(OpenGLGraphicsVertexes)
 
-        ~NormalOpenGLGraphicsVertexes();
+        ~OpenGLGraphicsVertexes();
 
         GLfloat *switchFloatTexArray();
 
@@ -140,7 +140,7 @@ class ImageVertexes final
 
         const Image *image;
 #ifdef USE_OPENGL
-        NormalOpenGLGraphicsVertexes ogl;
+        OpenGLGraphicsVertexes ogl;
 #endif
         DoubleRects sdl;
 };
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index bd8c38d5e..35b99c43a 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -580,7 +580,7 @@ void MobileOpenGLGraphics::drawRescaledPattern(const Image *const image,
 }
 
 inline void MobileOpenGLGraphics::drawVertexes(const
-                                               NormalOpenGLGraphicsVertexes
+                                               OpenGLGraphicsVertexes
                                                &ogl)
 {
     const std::vector<GLshort*> &shortVertPool = ogl.mShortVertPool;
@@ -638,7 +638,7 @@ void MobileOpenGLGraphics::calcPatternInline(ImageVertexes *const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
     unsigned int vp = ogl.continueVp();
 
     // Draw a set of textured rectangles
@@ -768,7 +768,7 @@ void MobileOpenGLGraphics::calcTileVertexesInline(ImageVertexes *const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
 
 //    std::vector<int> *vps = ogl.getVp();
     unsigned int vp = ogl.continueVp();
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index 813bcc987..8f8fae9dc 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -45,7 +45,7 @@
 
 #include <set>
 
-class NormalOpenGLGraphicsVertexes;
+class OpenGLGraphicsVertexes;
 
 class MobileOpenGLGraphics final : public Graphics
 {
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index fc21fd622..11fda1b41 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -529,8 +529,7 @@ void ModernOpenGLGraphics::drawRescaledPattern(const Image *const image,
 }
 
 inline void ModernOpenGLGraphics::drawVertexes(const
-                                               NormalOpenGLGraphicsVertexes
-                                               &ogl)
+                                               OpenGLGraphicsVertexes &ogl)
 {
 }
 
@@ -547,6 +546,7 @@ void ModernOpenGLGraphics::calcPatternInline(ImageVertexes *const vert,
                                              const int x, const int y,
                                              const int w, const int h) const
 {
+
 }
 
 void ModernOpenGLGraphics::calcTileCollection(ImageCollection *const vertCol,
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index ada964ee9..651a9462f 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -45,7 +45,7 @@
 
 #include <set>
 
-class NormalOpenGLGraphicsVertexes;
+class OpenGLGraphicsVertexes;
 class ShaderProgram;
 
 class ModernOpenGLGraphics final : public Graphics
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 54d773cc4..2348fa22b 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -776,7 +776,7 @@ void NormalOpenGLGraphics::drawRescaledPattern(const Image *const image,
 }
 
 inline void NormalOpenGLGraphics::drawVertexes(const
-                                               NormalOpenGLGraphicsVertexes
+                                               OpenGLGraphicsVertexes
                                                &ogl)
 {
     const std::vector<GLint*> &intVertPool = ogl.mIntVertPool;
@@ -848,7 +848,7 @@ void NormalOpenGLGraphics::calcPatternInline(ImageVertexes* const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
     unsigned int vp = ogl.continueVp();
 
     // Draw a set of textured rectangles
@@ -1007,7 +1007,7 @@ void NormalOpenGLGraphics::calcTileVertexesInline(ImageVertexes *const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
 
 //    std::vector<int> *vps = ogl.getVp();
     unsigned int vp = ogl.continueVp();
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index bc77b6563..361093183 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -45,7 +45,7 @@
 
 #include <set>
 
-class NormalOpenGLGraphicsVertexes;
+class OpenGLGraphicsVertexes;
 
 class NormalOpenGLGraphics final : public Graphics
 {
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index d6f724f06..bfe9172c8 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -516,7 +516,7 @@ void NullOpenGLGraphics::drawRescaledPattern(const Image *const image,
 }
 
 inline void NullOpenGLGraphics::drawVertexes(const
-                                             NormalOpenGLGraphicsVertexes
+                                             OpenGLGraphicsVertexes
                                              &ogl)
 {
     const std::vector<GLint*> &intVertPool = ogl.mIntVertPool;
@@ -588,7 +588,7 @@ void NullOpenGLGraphics::calcPatternInline(ImageVertexes* const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
     unsigned int vp = ogl.continueVp();
 
     // Draw a set of textured rectangles
@@ -788,7 +788,7 @@ void NullOpenGLGraphics::calcTileVertexesInline(ImageVertexes *const vert,
 
     const unsigned int vLimit = mMaxVertices * 4;
 
-    NormalOpenGLGraphicsVertexes &ogl = vert->ogl;
+    OpenGLGraphicsVertexes &ogl = vert->ogl;
 
 //    std::vector<int> *vps = ogl.getVp();
     unsigned int vp = ogl.continueVp();
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index e01e3b2ef..9667a483b 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -45,7 +45,7 @@
 
 #include <set>
 
-class NormalOpenGLGraphicsVertexes;
+class OpenGLGraphicsVertexes;
 
 class NullOpenGLGraphics final : public Graphics
 {
diff --git a/src/render/openglgraphicsdefadvanced.hpp b/src/render/openglgraphicsdefadvanced.hpp
index bb45035c3..321fcdb69 100644
--- a/src/render/openglgraphicsdefadvanced.hpp
+++ b/src/render/openglgraphicsdefadvanced.hpp
@@ -21,7 +21,7 @@
  */
 
 public:
-    inline void drawVertexes(const NormalOpenGLGraphicsVertexes &ogl);
+    inline void drawVertexes(const OpenGLGraphicsVertexes &ogl);
 
     void initArrays(const int vertCount) override final;