summaryrefslogtreecommitdiff
path: root/src/resources/openglimagehelper.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-13 22:18:03 +0300
committerAndrei Karas <akaras@inbox.ru>2012-09-30 02:57:13 +0300
commit135c19b4337e1ab45cff40a306eadc52a061ddef (patch)
tree0a163ca1edd542aec5570b7e451034aafb4089dd /src/resources/openglimagehelper.cpp
parent3a2bab265768c219b0c077eef10b69dfe8158131 (diff)
downloadmv-135c19b4337e1ab45cff40a306eadc52a061ddef.tar.gz
mv-135c19b4337e1ab45cff40a306eadc52a061ddef.tar.bz2
mv-135c19b4337e1ab45cff40a306eadc52a061ddef.tar.xz
mv-135c19b4337e1ab45cff40a306eadc52a061ddef.zip
add atlas textures support.
Diffstat (limited to 'src/resources/openglimagehelper.cpp')
-rw-r--r--src/resources/openglimagehelper.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 2ae819a11..8aed5330e 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -24,19 +24,19 @@
#ifdef USE_OPENGL
-#include "resources/dye.h"
-#include "resources/resourcemanager.h"
-
+#include "client.h"
+#include "game.h"
+#include "graphicsmanager.h"
+#include "logger.h"
#include "normalopenglgraphics.h"
#include "safeopenglgraphics.h"
-#include "client.h"
-#include "logger.h"
+#include "resources/dye.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
#include "utils/stringutils.h"
-#include "resources/image.h"
-
#include <SDL_image.h>
#include <SDL_rotozoom.h>
@@ -48,7 +48,7 @@ int OpenGLImageHelper::mTextureSize = 0;
bool OpenGLImageHelper::mBlur = true;
int OpenGLImageHelper::mUseOpenGL = 0;
-Resource *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
+Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
{
SDL_Surface *const tmpImage = IMG_Load_RW(rw, 1);
@@ -300,5 +300,4 @@ int OpenGLImageHelper::useOpenGL()
{
return mUseOpenGL;
}
-
#endif