Move graphicsvertexes into render/vertexes.

27 files changed, 52 insertions, 32 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2d91fd51..970d45fa2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -956,8 +956,8 @@ SET(SRCS
     render/graphics.h
     graphicsmanager.cpp
     graphicsmanager.h
-    graphicsvertexes.cpp
-    graphicsvertexes.h
+    render/vertexes/graphicsvertexes.cpp
+    render/vertexes/graphicsvertexes.h
     guild.cpp
     guild.h
     enums/commandtarget.h
@@ -1348,8 +1348,8 @@ SET(DYE_CMD_SRCS
     configuration.h
     graphicsmanager.cpp
     graphicsmanager.h
-    graphicsvertexes.cpp
-    graphicsvertexes.h
+    render/vertexes/graphicsvertexes.cpp
+    render/vertexes/graphicsvertexes.h
     logger.cpp
     logger.h
     navigationmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index d537e8f60..42d993f47 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -522,8 +522,8 @@ SRC += events/actionevent.h \
 	      render/graphics.h \
 	      graphicsmanager.cpp \
 	      graphicsmanager.h \
-	      graphicsvertexes.cpp \
-	      graphicsvertexes.h \
+	      render/vertexes/graphicsvertexes.cpp \
+	      render/vertexes/graphicsvertexes.h \
 	      events/inputevent.h \
 	      input/inputactiondata.h \
 	      input/inputactionoperators.cpp \
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 7caf28d7d..18e8c8a49 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -23,7 +23,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "graphicsvertexes.h"
 
 #include "being/localplayer.h"
 
@@ -42,6 +41,8 @@
 
 #include "gui/windows/chatwindow.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 
 #include "resources/map/map.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 246e08a8e..563d6aa0c 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/button.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "resources/image.h"
@@ -79,6 +78,8 @@
 
 #include "render/renderers.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index a14bfe96a..e1f25a19c 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -20,10 +20,10 @@
 
 #include "gui/widgets/emotepage.h"
 
-#include "graphicsvertexes.h"
-
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index afdf91e79..fbe213964 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/itemcontainer.h"
 
 #include "dragdrop.h"
-#include "graphicsvertexes.h"
 
 #include "being/playerinfo.h"
 
@@ -60,6 +59,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/iteminfo.h"
 
 #include <algorithm>
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 3de1bbed9..d48921056 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/popup.h"
 
-#include "graphicsvertexes.h"
-
 #include "gui/popupmanager.h"
 #include "gui/skin.h"
 
@@ -34,6 +32,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 Popup::Popup(const std::string &name,
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 15a3996ed..9456b835a 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/progressbar.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -34,6 +33,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 int ProgressBar::mInstances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index ff198fa65..8d003e9f3 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/scrollarea.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -76,6 +75,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 7ff7da55a..392895f65 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -33,6 +32,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 float ShortcutContainer::mAlpha = 1.0;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 88b385be9..e7d14ac59 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/slider.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -77,6 +76,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 ImageRect Slider::buttons[2];
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 7f5c26c8f..707e0dffe 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/tabs/tab.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -74,6 +73,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1c63bba31..c8535b197 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -72,7 +72,6 @@
 #else
 #include "resources/image.h"
 #endif
-#include "graphicsvertexes.h"
 #include "soundmanager.h"
 
 #include "const/sound.h"
@@ -94,6 +93,8 @@
 
 #include "render/renderers.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 62feb6e7d..79095b301 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 #include "dragdrop.h"
-#include "graphicsvertexes.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -42,6 +41,8 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/tabstrip.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/equipmentslots.h"
 #include "resources/imageset.h"
 
diff --git a/src/input/touch/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index cbf442027..4b363e09d 100644
--- a/src/input/touch/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -21,7 +21,6 @@
 #include "input/touch/touchmanager.h"
 
 #include "configuration.h"
-#include "graphicsvertexes.h"
 
 #include "gui/gui.h"
 #include "gui/skin.h"
@@ -38,6 +37,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index ed2ca8b17..7e40f4139 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -25,7 +25,6 @@
 #include "render/mobileopengl2graphics.h"
 
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 
 #include "render/opengl/mgl.h"
@@ -36,6 +35,8 @@
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 20d8f3661..b3aca8ed8 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -24,7 +24,6 @@
 
 #include "render/mobileopenglgraphics.h"
 
-#include "graphicsvertexes.h"
 #include "logger.h"
 
 #include "render/opengl/mgl.h"
@@ -32,6 +31,8 @@
 #include "render/opengl/naclglfunctions.h"
 #endif
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index b5d97b80a..1cfb07690 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -25,7 +25,6 @@
 #include "render/modernopenglgraphics.h"
 
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 
 #include "render/opengl/mgl.h"
@@ -36,6 +35,8 @@
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 9aaa2aa47..bd6aa2b38 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -24,11 +24,12 @@
 
 #include "render/normalopenglgraphics.h"
 
-#include "graphicsvertexes.h"
 #include "logger.h"
 
 #include "render/opengl/mgl.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 51abe9183..7203468a6 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -25,12 +25,13 @@
 #include "render/nullopenglgraphics.h"
 
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 
 #ifdef DEBUG_BIND_TEXTURE
 #include "logger.h"
 #endif
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 #include "resources/openglimagehelper.h"
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 96ade5e4f..6b798eaec 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -71,9 +71,10 @@
 
 #include "configuration.h"
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/imagerect.h"
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index f59ee5f51..a8f307124 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -28,9 +28,10 @@
 
 #include "configuration.h"
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagehelper.h"
 #include "resources/imagerect.h"
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 8b7711a5c..421b2508b 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -27,12 +27,13 @@
 #include "main.h"
 
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 
 #include "utils/sdlcheckutils.h"
 
 #include "utils/sdlpixel.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/graphicsvertexes.cpp b/src/render/vertexes/graphicsvertexes.cpp
index fd4213e0e..8c4283f6a 100644
--- a/src/graphicsvertexes.cpp
+++ b/src/render/vertexes/graphicsvertexes.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "graphicsvertexes.h"
+#include "render/vertexes/graphicsvertexes.h"
 
 #ifdef USE_OPENGL
 #include "render/graphics.h"
diff --git a/src/graphicsvertexes.h b/src/render/vertexes/graphicsvertexes.h
index 8f54c5550..8f54c5550 100644
--- a/src/graphicsvertexes.h
+++ b/src/render/vertexes/graphicsvertexes.h
diff --git a/src/resources/map/maprowvertexes.h b/src/resources/map/maprowvertexes.h
index 46e2e7250..38823ed5f 100644
--- a/src/resources/map/maprowvertexes.h
+++ b/src/resources/map/maprowvertexes.h
@@ -23,7 +23,7 @@
 
 #include "utils/dtor.h"
 
-#include "graphicsvertexes.h"
+#include "render/vertexes/graphicsvertexes.h"
 
 #include "localconsts.h"
 
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index d7bb532f2..25efabb43 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -23,7 +23,6 @@
 #ifdef USE_OPENGL
 
 #include "graphicsmanager.h"
-#include "graphicsvertexes.h"
 #include "settings.h"
 #include "soundmanager.h"
 
@@ -39,6 +38,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagewriter.h"
 #include "resources/mstack.h"