From f69f346518f473f4f8fb13966e5831d105d1239c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 7 Jun 2016 15:41:00 +0300 Subject: Move image class into image directory. --- src/render/mobileopengl2graphics.cpp | 3 ++- src/render/mobileopenglgraphics.cpp | 3 ++- src/render/modernopenglgraphics.cpp | 3 ++- src/render/normalopenglgraphics.cpp | 3 ++- src/render/nullopenglgraphics.cpp | 3 ++- src/render/safeopenglgraphics.cpp | 3 ++- src/render/sdl2graphics.cpp | 3 ++- src/render/sdl2softwaregraphics.cpp | 3 ++- src/render/sdlgraphics.cpp | 3 ++- src/render/surfacegraphics.cpp | 4 ++-- 10 files changed, 20 insertions(+), 11 deletions(-) (limited to 'src/render') diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp index 5feaa0d2e..017d02e58 100644 --- a/src/render/mobileopengl2graphics.cpp +++ b/src/render/mobileopengl2graphics.cpp @@ -37,10 +37,11 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" +#include "resources/image/image.h" + #include "utils/delete2.h" #include "utils/sdlcheckutils.h" #include "utils/sdlhelper.h" diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index c8d4a93d4..dac566822 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -33,10 +33,11 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" +#include "resources/image/image.h" + #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index afebaf1c5..6eb98601a 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -37,10 +37,11 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" +#include "resources/image/image.h" + #include "utils/delete2.h" #include "utils/sdlcheckutils.h" #include "utils/sdlhelper.h" diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 751877bfe..22aef9cda 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -30,10 +30,11 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" +#include "resources/image/image.h" + #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp index d4e878479..6d4795e94 100644 --- a/src/render/nullopenglgraphics.cpp +++ b/src/render/nullopenglgraphics.cpp @@ -32,10 +32,11 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/openglimagehelper.h" +#include "resources/image/image.h" + #include "debug.h" GLuint NullOpenGLGraphics::mTextureBinded = 0; diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index 48fe5e2d2..079ea9d31 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -25,10 +25,11 @@ #include "render/opengl/mgl.h" -#include "resources/image.h" #include "resources/imagerect.h" #include "resources/safeopenglimagehelper.h" +#include "resources/image/image.h" + #include "utils/sdlcheckutils.h" #include "debug.h" diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index babeeb6fd..f00846563 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -75,11 +75,12 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagehelper.h" #include "resources/imagerect.h" #include "resources/sdl2imagehelper.h" +#include "resources/image/image.h" + #include "utils/sdlcheckutils.h" #include "utils/sdlpixel.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index 125ba8847..130d34b12 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -32,11 +32,12 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagehelper.h" #include "resources/imagerect.h" #include "resources/sdl2softwareimagehelper.h" +#include "resources/image/image.h" + #include "utils/sdlcheckutils.h" #include "utils/sdlpixel.h" diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 40978f2d6..b8c770bf4 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -34,9 +34,10 @@ #include "render/vertexes/imagecollection.h" -#include "resources/image.h" #include "resources/imagerect.h" +#include "resources/image/image.h" + #include "debug.h" #ifndef SDL_BYTEORDER diff --git a/src/render/surfacegraphics.cpp b/src/render/surfacegraphics.cpp index e6fc33298..f499e2c14 100644 --- a/src/render/surfacegraphics.cpp +++ b/src/render/surfacegraphics.cpp @@ -22,12 +22,12 @@ #include "render/surfacegraphics.h" -#include "resources/image.h" - #ifndef USE_SDL2 #include "resources/surfaceimagehelper.h" #endif // USE_SDL2 +#include "resources/image/image.h" + #include "debug.h" SurfaceGraphics::SurfaceGraphics() : -- cgit v1.2.3-60-g2f50