Add mesh and texture subdirectories to engine/graphics

CMakeLists.txt

@@ -162,19 +162,15 @@ set(GRAPHICS_HEADERS
     src/engine/graphics/font.h
     src/engine/graphics/fonts.h
     src/engine/graphics/framebuffer.h
-    src/engine/graphics/image/curreader.h
-    src/engine/graphics/image/tgareader.h
-    src/engine/graphics/image/tgawriter.h
-    src/engine/graphics/image/tpcreader.h
-    src/engine/graphics/image/txireader.h
     src/engine/graphics/lip/lipanimation.h
     src/engine/graphics/lip/lipreader.h
     src/engine/graphics/lip/lips.h
     src/engine/graphics/lip/lipwriter.h
     src/engine/graphics/material.h
     src/engine/graphics/materials.h
-    src/engine/graphics/mesh.h
-    src/engine/graphics/meshes.h
+    src/engine/graphics/mesh/mesh.h
+    src/engine/graphics/mesh/meshes.h
+    src/engine/graphics/mesh/vertexattributes.h
     src/engine/graphics/model/aabbnode.h
     src/engine/graphics/model/animatedproperty.h
     src/engine/graphics/model/animation.h
@@ -189,12 +185,16 @@ set(GRAPHICS_HEADERS
     src/engine/graphics/renderbuffer.h
     src/engine/graphics/shader/shaders.h
     src/engine/graphics/statemanager.h
-    src/engine/graphics/texture.h
-    src/engine/graphics/textures.h
-    src/engine/graphics/textureutil.h
+    src/engine/graphics/texture/curreader.h
+    src/engine/graphics/texture/texture.h
+    src/engine/graphics/texture/textures.h
+    src/engine/graphics/texture/textureutil.h
+    src/engine/graphics/texture/tgareader.h
+    src/engine/graphics/texture/tgawriter.h
+    src/engine/graphics/texture/tpcreader.h
+    src/engine/graphics/texture/txireader.h
     src/engine/graphics/textutil.h
     src/engine/graphics/types.h
-    src/engine/graphics/vertexattributes.h
     src/engine/graphics/walkmesh/bwmreader.h
     src/engine/graphics/walkmesh/walkmesh.h
     src/engine/graphics/walkmesh/walkmeshes.h
@@ -207,19 +207,13 @@ set(GRAPHICS_SOURCES
     src/engine/graphics/font.cpp
     src/engine/graphics/fonts.cpp
     src/engine/graphics/framebuffer.cpp
-    src/engine/graphics/image/curreader.cpp
-    src/engine/graphics/image/tgareader.cpp
-    src/engine/graphics/image/tgawriter.cpp
-    src/engine/graphics/image/tpcreader.cpp
-    src/engine/graphics/image/txireader.cpp
     src/engine/graphics/lip/lipanimation.cpp
     src/engine/graphics/lip/lipreader.cpp
     src/engine/graphics/lip/lips.cpp
     src/engine/graphics/lip/lipwriter.cpp
     src/engine/graphics/materials.cpp
-    src/engine/graphics/mesh.cpp
-    src/engine/graphics/meshes.cpp
-    src/engine/graphics/model/aabbnode.cpp
+    src/engine/graphics/mesh/mesh.cpp
+    src/engine/graphics/mesh/meshes.cpp
     src/engine/graphics/model/animation.cpp
     src/engine/graphics/model/mdlreader.cpp
     src/engine/graphics/model/model.cpp
@@ -233,9 +227,14 @@ set(GRAPHICS_SOURCES
     src/engine/graphics/shader/shaders_pbr.cpp
     src/engine/graphics/shader/shaders_phong.cpp
     src/engine/graphics/statemanager.cpp
-    src/engine/graphics/texture.cpp
-    src/engine/graphics/textures.cpp
-    src/engine/graphics/textureutil.cpp
+    src/engine/graphics/texture/curreader.cpp
+    src/engine/graphics/texture/texture.cpp
+    src/engine/graphics/texture/textures.cpp
+    src/engine/graphics/texture/textureutil.cpp
+    src/engine/graphics/texture/tgareader.cpp
+    src/engine/graphics/texture/tgawriter.cpp
+    src/engine/graphics/texture/tpcreader.cpp
+    src/engine/graphics/texture/txireader.cpp
     src/engine/graphics/textutil.cpp
     src/engine/graphics/walkmesh/bwmreader.cpp
     src/engine/graphics/walkmesh/walkmesh.cpp

src/engine/game/console.cpp

@@ -27,7 +27,7 @@
 #include "../common/log.h"
 #include "../graphics/font.h"
 #include "../graphics/fonts.h"
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/shader/shaders.h"
 #include "../graphics/window.h"
 #include "../resource/resources.h"

src/engine/game/cursors.cpp

@@ -21,7 +21,7 @@
 
 #include "../common/streamutil.h"
 #include "../graphics/cursor.h"
-#include "../graphics/image/curreader.h"
+#include "../graphics/texture/curreader.h"
 #include "../resource/resources.h"
 
 using namespace std;

src/engine/game/game.cpp

@@ -29,11 +29,11 @@
 #include "../graphics/featureutil.h"
 #include "../graphics/lip/lips.h"
 #include "../graphics/materials.h"
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/model/mdlreader.h"
 #include "../graphics/model/models.h"
 #include "../graphics/pbribl.h"
-#include "../graphics/textures.h"
+#include "../graphics/texture/textures.h"
 #include "../graphics/walkmesh/walkmeshes.h"
 #include "../graphics/window.h"
 #include "../resource/resources.h"

src/engine/game/gui/chargen/portraitselect.cpp

@@ -21,7 +21,7 @@
 #include "../../../common/random.h"
 #include "../../../gui/scenebuilder.h"
 #include "../../../graphics/model/models.h"
-#include "../../../graphics/textures.h"
+#include "../../../graphics/texture/textures.h"
 #include "../../../resource/resources.h"
 #include "../../../scene/node/modelscenenode.h"
 

src/engine/game/gui/container.cpp

@@ -19,7 +19,7 @@
 
 #include "../../gui/control/imagebutton.h"
 #include "../../gui/control/listbox.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/strings.h"
 
 #include "../game.h"

src/engine/game/gui/gui.cpp

@@ -20,7 +20,7 @@
 #include <boost/format.hpp>
 
 #include "../../audio/player.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 
 #include "../gameidutil.h"
 

src/engine/game/gui/hud.cpp

@@ -19,7 +19,7 @@
 
 #include "../../common/log.h"
 #include "../../gui/control/label.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/window.h"
 
 #include "../game.h"

src/engine/game/gui/ingame/abilities.cpp

@@ -18,7 +18,7 @@
 #include "abilities.h"
 
 #include "../../../gui/control/listbox.h"
-#include "../../../graphics/textures.h"
+#include "../../../graphics/texture/textures.h"
 #include "../../../resource/resources.h"
 #include "../../../resource/strings.h"
 

src/engine/game/gui/ingame/equip.cpp

@@ -22,7 +22,7 @@
 
 #include "../../../gui/control/imagebutton.h"
 #include "../../../gui/control/listbox.h"
-#include "../../../graphics/textures.h"
+#include "../../../graphics/texture/textures.h"
 #include "../../../resource/strings.h"
 
 #include "../../game.h"

src/engine/game/gui/partyselect.cpp

@@ -21,7 +21,7 @@
 
 #include "../../gui/control/label.h"
 #include "../../gui/control/togglebutton.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../resource/strings.h"
 #include "../../script/types.h"

src/engine/game/gui/profileoverlay.cpp

@@ -25,7 +25,7 @@
 #include "glm/ext.hpp"
 
 #include "../../graphics/fonts.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/textutil.h"
 #include "../../graphics/window.h"

src/engine/game/gui/selectoverlay.cpp

@@ -21,11 +21,11 @@
 
 #include "../../graphics/font.h"
 #include "../../graphics/fonts.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/texture.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/texture.h"
+#include "../../graphics/texture/textures.h"
 #include "../../graphics/window.h"
 #include "../../resource/resources.h"
 

src/engine/game/map.cpp

@@ -26,9 +26,9 @@
 #include "SDL2/SDL_opengl.h"
 
 #include "../common/log.h"
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/statemanager.h"
-#include "../graphics/textures.h"
+#include "../graphics/texture/textures.h"
 #include "../graphics/window.h"
 #include "../resource/types.h"
 

src/engine/game/map.h

@@ -23,7 +23,7 @@
 #include "glm/vec2.hpp"
 #include "glm/vec4.hpp"
 
-#include "../graphics/texture.h"
+#include "../graphics/texture/texture.h"
 #include "../resource/format/gffreader.h"
 
 namespace reone {

src/engine/game/object/area.cpp

@@ -29,9 +29,9 @@
 #include "../../common/log.h"
 #include "../../common/random.h"
 #include "../../common/streamutil.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/model/models.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../graphics/walkmesh/walkmeshes.h"
 #include "../../resource/format/lytreader.h"
 #include "../../resource/format/visreader.h"

src/engine/game/object/area_are.cpp

@@ -23,7 +23,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../resource/strings.h"
 

src/engine/game/object/creature.cpp

@@ -28,7 +28,7 @@
 #include "../../common/streamutil.h"
 #include "../../common/timer.h"
 #include "../../graphics/model/models.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../resource/strings.h"
 #include "../../scene/types.h"

src/engine/game/object/creature_appearance.cpp

@@ -26,7 +26,7 @@
 
 #include "../../common/streamutil.h"
 #include "../../graphics/model/models.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../scene/types.h"
 

src/engine/game/object/creature_blueprint.cpp

@@ -23,7 +23,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../resource/strings.h"
 

src/engine/game/object/item.h

@@ -21,7 +21,7 @@
 
 #include "../../audio/stream.h"
 #include "../../graphics/model/model.h"
-#include "../../graphics/texture.h"
+#include "../../graphics/texture/texture.h"
 #include "../../resource/format/gffreader.h"
 
 #include "../types.h"

src/engine/game/object/item_blueprint.cpp

@@ -26,7 +26,7 @@
 
 #include "../../audio/files.h"
 #include "../../graphics/model/models.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../resource/resources.h"
 #include "../../resource/strings.h"
 

src/engine/game/portrait.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "../graphics/texture.h"
+#include "../graphics/texture/texture.h"
 
 namespace reone {
 

src/engine/game/portraits.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../graphics/textures.h"
+#include "../graphics/texture/textures.h"
 #include "../resource/resources.h"
 
 using namespace std;

src/engine/game/portraits.h

@@ -23,7 +23,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "../graphics/texture.h"
+#include "../graphics/texture/texture.h"
 
 #include "portrait.h"
 

src/engine/graphics/cursor.cpp

@@ -22,10 +22,10 @@
 #include "glm/glm.hpp"
 #include "glm/ext.hpp"
 
-#include "meshes.h"
+#include "mesh/meshes.h"
 #include "shader/shaders.h"
 #include "statemanager.h"
-#include "texture.h"
+#include "texture/texture.h"
 #include "window.h"
 
 using namespace std;

src/engine/graphics/font.cpp

@@ -24,7 +24,7 @@
 
 #include "glm/ext.hpp"
 
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/window.h"
 
 #include "shader/shaders.h"

src/engine/graphics/font.h

@@ -23,7 +23,7 @@
 #include "glm/vec2.hpp"
 #include "glm/vec3.hpp"
 
-#include "texture.h"
+#include "texture/texture.h"
 
 namespace reone {
 

src/engine/graphics/fonts.cpp

@@ -21,7 +21,7 @@
 #include "../resource/resources.h"
 
 #include "font.h"
-#include "textures.h"
+#include "texture/textures.h"
 
 using namespace std;
 using namespace std::placeholders;

src/engine/graphics/framebuffer.h

@@ -22,7 +22,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "renderbuffer.h"
-#include "texture.h"
+#include "texture/texture.h"
 
 namespace reone {
 

src/engine/graphics/mesh/mesh.h

@@ -22,7 +22,8 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "aabb.h"
+#include "../aabb.h"
+
 #include "vertexattributes.h"
 
 namespace reone {

src/engine/graphics/model/emitter.h

@@ -21,7 +21,7 @@
 
 #include "glm/vec2.hpp"
 
-#include "../texture.h"
+#include "../texture/texture.h"
 
 namespace reone {
 

src/engine/graphics/model/lensflare.h

@@ -21,7 +21,7 @@
 
 #include "glm/vec3.hpp"
 
-#include "../texture.h"
+#include "../texture/texture.h"
 
 namespace reone {
 

src/engine/graphics/model/mdlreader.cpp

@@ -26,7 +26,7 @@
 #include "../../common/collectionutil.h"
 #include "../../common/log.h"
 
-#include "../textures.h"
+#include "../texture/textures.h"
 
 #include "models.h"
 

src/engine/graphics/model/modelnode.h

@@ -24,7 +24,7 @@
 
 #include "glm/gtx/quaternion.hpp"
 
-#include "../mesh.h"
+#include "../mesh/mesh.h"
 
 #include "aabbnode.h"
 #include "animatedproperty.h"

src/engine/graphics/pbribl.cpp

@@ -22,12 +22,12 @@
 
 #include "glm/ext.hpp"
 
-#include "meshes.h"
+#include "mesh/meshes.h"
 #include "renderbuffer.h"
 #include "shader/shaders.h"
 #include "statemanager.h"
-#include "texture.h"
-#include "textureutil.h"
+#include "texture/texture.h"
+#include "texture/textureutil.h"
 
 using namespace std;
 

src/engine/graphics/pbribl.h

@@ -25,7 +25,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "framebuffer.h"
-#include "texture.h"
+#include "texture/texture.h"
 
 namespace reone {
 

src/engine/graphics/shader/shaders.cpp

@@ -27,8 +27,8 @@
 
 #include "glm/ext.hpp"
 
-#include "../texture.h"
-#include "../textures.h"
+#include "../texture/texture.h"
+#include "../texture/textures.h"
 
 using namespace std;
 

src/engine/graphics/texture/curreader.cpp

@@ -17,7 +17,7 @@
 
 #include "curreader.h"
 
-#include "../textureutil.h"
+#include "textureutil.h"
 
 using namespace std;
 

src/engine/graphics/texture/curreader.h

@@ -19,7 +19,7 @@
 
 #include "../../resource/format/binreader.h"
 
-#include "../texture.h"
+#include "texture.h"
 
 namespace reone {
 

src/engine/graphics/texture/texture.cpp

@@ -23,7 +23,8 @@
 #include "GL/glew.h"
 #include "SDL2/SDL_opengl.h"
 
-#include "pixelutil.h"
+#include "../pixelutil.h"
+
 #include "textureutil.h"
 
 using namespace std;

src/engine/graphics/texture/texture.h

@@ -24,9 +24,9 @@
 
 #include "glm/vec3.hpp"
 
-#include "../common/types.h"
+#include "../../common/types.h"
 
-#include "types.h"
+#include "../types.h"
 
 namespace reone {
 

src/engine/graphics/texture/textures.cpp

@@ -19,17 +19,18 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "../common/log.h"
-#include "../common/streamutil.h"
-#include "../resource/resources.h"
+#include "../../common/log.h"
+#include "../../common/streamutil.h"
+#include "../../resource/resources.h"
 
-#include "image/curreader.h"
-#include "image/tgareader.h"
-#include "image/tpcreader.h"
-#include "image/txireader.h"
-#include "statemanager.h"
+#include "../statemanager.h"
+#include "../types.h"
+
+#include "curreader.h"
 #include "textureutil.h"
-#include "types.h"
+#include "tgareader.h"
+#include "tpcreader.h"
+#include "txireader.h"
 
 using namespace std;
 

src/engine/graphics/texture/textures.h

@@ -23,9 +23,9 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "../resource/types.h"
+#include "../../resource/types.h"
 
-#include "types.h"
+#include "../types.h"
 
 namespace reone {
 

src/engine/graphics/texture/tgareader.cpp

@@ -21,7 +21,7 @@
 
 #include "../../common/log.h"
 
-#include "../textureutil.h"
+#include "textureutil.h"
 
 using namespace std;
 

src/engine/graphics/texture/tgareader.h

@@ -21,9 +21,10 @@
 
 #include "../../resource/format/binreader.h"
 
-#include "../texture.h"
 #include "../types.h"
 
+#include "texture.h"
+
 namespace reone {
 
 namespace graphics {

src/engine/graphics/texture/tgawriter.h

@@ -22,7 +22,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include "../texture.h"
+#include "texture.h"
 
 namespace reone {
 

src/engine/graphics/texture/tpcreader.cpp

@@ -21,8 +21,7 @@
 
 #include "../../common/streamutil.h"
 
-#include "../textureutil.h"
-
+#include "textureutil.h"
 #include "txireader.h"
 
 using namespace std;

src/engine/graphics/texture/tpcreader.h

@@ -19,7 +19,7 @@
 
 #include "../../resource/format/binreader.h"
 
-#include "../texture.h"
+#include "texture.h"
 
 namespace reone {
 

src/engine/graphics/texture/txireader.h

@@ -20,7 +20,7 @@
 #include <istream>
 #include <memory>
 
-#include "../texture.h"
+#include "texture.h"
 
 namespace reone {
 

src/engine/graphics/window.h

@@ -25,7 +25,7 @@
 #include "glm/mat4x4.hpp"
 
 #include "cursor.h"
-#include "texture.h"
+#include "texture/texture.h"
 #include "types.h"
 
 namespace reone {

src/engine/gui/control/control.cpp

@@ -23,10 +23,10 @@
 
 #include "../../common/log.h"
 #include "../../graphics/fonts.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../graphics/textutil.h"
 #include "../../graphics/window.h"
 #include "../../resource/strings.h"

src/engine/gui/control/control.h

@@ -28,7 +28,7 @@
 
 #include "../../graphics/font.h"
 #include "../../graphics/framebuffer.h"
-#include "../../graphics/texture.h"
+#include "../../graphics/texture/texture.h"
 #include "../../resource/format/gffreader.h"
 #include "../../scene/node/modelscenenode.h"
 #include "../../scene/pipeline/control.h"

src/engine/gui/control/imagebutton.cpp

@@ -18,7 +18,7 @@
 #include "imagebutton.h"
 
 #include "../../graphics/fonts.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/statemanager.h"
 #include "../../graphics/window.h"
 

src/engine/gui/control/listbox.cpp

@@ -18,7 +18,7 @@
 #include "listbox.h"
 
 #include "../../common/log.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/textutil.h"
 #include "../../resource/resources.h"

src/engine/gui/control/progressbar.cpp

@@ -17,9 +17,9 @@
 
 #include "progressbar.h"
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../graphics/window.h"
 
 using namespace std;

src/engine/gui/control/scrollbar.cpp

@@ -17,10 +17,10 @@
 
 #include "scrollbar.h"
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 #include "../../graphics/window.h"
 #include "../../resource/resources.h"
 

src/engine/gui/gui.cpp

@@ -20,10 +20,10 @@
 #include <stdexcept>
 
 #include "../common/log.h"
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/shader/shaders.h"
 #include "../graphics/statemanager.h"
-#include "../graphics/textures.h"
+#include "../graphics/texture/textures.h"
 #include "../graphics/window.h"
 #include "../resource/resources.h"
 

src/engine/scene/node/emitternode.cpp

@@ -24,7 +24,7 @@
 #include "glm/gtc/constants.hpp"
 
 #include "../../common/random.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
 

src/engine/scene/node/grassnode.cpp

@@ -19,7 +19,7 @@
 
 #include <stdexcept>
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
 

src/engine/scene/node/grassnode.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../../graphics/texture.h"
+#include "../../graphics/texture/texture.h"
 
 #include "../grasscluster.h"
 

src/engine/scene/node/lightnode.cpp

@@ -19,7 +19,7 @@
 
 #include "glm/ext.hpp"
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
 #include "../../graphics/window.h"

src/engine/scene/node/meshnode.h

@@ -19,7 +19,7 @@
 
 #include "scenenode.h"
 
-#include "../../graphics/mesh.h"
+#include "../../graphics/mesh/mesh.h"
 
 namespace reone {
 

src/engine/scene/node/modelnodescenenode.cpp

@@ -29,7 +29,7 @@
 #include "../../graphics/pbribl.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
+#include "../../graphics/texture/textures.h"
 
 #include "../scenegraph.h"
 

src/engine/scene/node/modelscenenode.cpp

@@ -21,7 +21,7 @@
 #include "../../common/collectionutil.h"
 #include "../../common/log.h"
 #include "../../graphics/featureutil.h"
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../resource/resources.h"
 
 #include "../scenegraph.h"

src/engine/scene/pipeline/control.cpp

@@ -21,11 +21,11 @@
 
 #include "glm/ext.hpp"
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
-#include "../../graphics/textureutil.h"
+#include "../../graphics/texture/textures.h"
+#include "../../graphics/texture/textureutil.h"
 
 #include "../node/cameranode.h"
 #include "../scenegraph.h"

src/engine/scene/pipeline/control.h

@@ -24,7 +24,7 @@
 
 #include "../../graphics/framebuffer.h"
 #include "../../graphics/renderbuffer.h"
-#include "../../graphics/texture.h"
+#include "../../graphics/texture/texture.h"
 
 #include "../scenegraph.h"
 

src/engine/scene/pipeline/world.cpp

@@ -23,12 +23,12 @@
 
 #include "GL/glew.h"
 
-#include "../../graphics/meshes.h"
+#include "../../graphics/mesh/meshes.h"
 #include "../../graphics/pbribl.h"
 #include "../../graphics/shader/shaders.h"
 #include "../../graphics/statemanager.h"
-#include "../../graphics/textures.h"
-#include "../../graphics/textureutil.h"
+#include "../../graphics/texture/textures.h"
+#include "../../graphics/texture/textureutil.h"
 #include "../../graphics/window.h"
 
 #include "../node/cameranode.h"

src/engine/scene/pipeline/world.h

@@ -23,7 +23,7 @@
 
 #include "../../graphics/framebuffer.h"
 #include "../../graphics/renderbuffer.h"
-#include "../../graphics/texture.h"
+#include "../../graphics/texture/texture.h"
 #include "../../graphics/types.h"
 
 #include "../scenegraph.h"

src/engine/scene/scenegraph.cpp

@@ -19,7 +19,7 @@
 
 #include <algorithm>
 
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 
 #include "node/cameranode.h"
 #include "node/emitternode.h"

src/engine/video/video.cpp

@@ -24,10 +24,10 @@
 
 #include "glm/ext.hpp"
 
-#include "../graphics/meshes.h"
+#include "../graphics/mesh/meshes.h"
 #include "../graphics/shader/shaders.h"
 #include "../graphics/statemanager.h"
-#include "../graphics/textureutil.h"
+#include "../graphics/texture/textureutil.h"
 
 using namespace std;
 

src/engine/video/video.h

@@ -23,7 +23,7 @@
 #include "../audio/stream.h"
 #include "../common/mediastream.h"
 #include "../common/types.h"
-#include "../graphics/texture.h"
+#include "../graphics/texture/texture.h"
 
 namespace reone {
 

src/tools/tpctool.cpp

@@ -22,8 +22,8 @@
 #include "s3tc.h"
 
 #include "../engine/common/log.h"
-#include "../engine/graphics/image/tgawriter.h"
-#include "../engine/graphics/image/tpcreader.h"
+#include "../engine/graphics/texture/tgawriter.h"
+#include "../engine/graphics/texture/tpcreader.h"
 
 using namespace std;