Rename NormalOpenGLGraphicsVertexes into OpenGLGraphicsVertexes.

9 files changed, 16 insertions, 16 deletions

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;