summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-18 21:36:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-18 21:36:26 +0300
commit55ff7fa3903b470ea7b4c74fb371252ec67e5e33 (patch)
tree2ed89159e8ac64744ae6ddae602adc7a0c3b7866 /src
parent49a7df51386e49d51b7bdd626265f61be3833a3d (diff)
downloadmv-55ff7fa3903b470ea7b4c74fb371252ec67e5e33.tar.gz
mv-55ff7fa3903b470ea7b4c74fb371252ec67e5e33.tar.bz2
mv-55ff7fa3903b470ea7b4c74fb371252ec67e5e33.tar.xz
mv-55ff7fa3903b470ea7b4c74fb371252ec67e5e33.zip
Move textureatlas into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/resources/atlasmanager.cpp1
-rw-r--r--src/resources/atlasmanager.h23
-rw-r--r--src/resources/atlasresource.cpp1
-rw-r--r--src/resources/textureatlas.h61
6 files changed, 66 insertions, 22 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6dd8a190..c8f308adf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -597,6 +597,7 @@ SET(SRCS
resources/subimage.h
resources/surfaceimagehelper.cpp
resources/surfaceimagehelper.h
+ resources/textureatlas.h
resources/updatefile.h
resources/wallpaper.cpp
resources/wallpaper.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c9bc36ef4..566efaffc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,6 +99,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
resources/subimage.h \
resources/surfaceimagehelper.cpp \
resources/surfaceimagehelper.h \
+ resources/textureatlas.h \
resources/updatefile.h \
resources/spritedef.cpp \
resources/spritedef.h \
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp
index 01a1a0b91..49607786e 100644
--- a/src/resources/atlasmanager.cpp
+++ b/src/resources/atlasmanager.cpp
@@ -37,6 +37,7 @@
#include "resources/imagehelper.h"
#include "resources/openglimagehelper.h"
#include "resources/resourcemanager.h"
+#include "resources/textureatlas.h"
#include "debug.h"
diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h
index 8fb2d6dcc..0cb7b98b5 100644
--- a/src/resources/atlasmanager.h
+++ b/src/resources/atlasmanager.h
@@ -33,28 +33,7 @@ class AtlasResource;
class Resource;
struct AtlasItem;
-
-struct TextureAtlas final
-{
- TextureAtlas() :
- name(),
- atlasImage(nullptr),
- surface(nullptr),
- width(0),
- height(0),
- items()
- {
- }
-
- A_DELETE_COPY(TextureAtlas)
-
- std::string name;
- Image *atlasImage;
- SDL_Surface *surface;
- int width;
- int height;
- std::vector <AtlasItem*> items;
-};
+struct TextureAtlas;
class AtlasManager final
{
diff --git a/src/resources/atlasresource.cpp b/src/resources/atlasresource.cpp
index 26edd2828..e072bcb06 100644
--- a/src/resources/atlasresource.cpp
+++ b/src/resources/atlasresource.cpp
@@ -27,6 +27,7 @@
#include "resources/atlasitem.h"
#include "resources/atlasmanager.h"
#include "resources/resourcemanager.h"
+#include "resources/textureatlas.h"
#include "debug.h"
diff --git a/src/resources/textureatlas.h b/src/resources/textureatlas.h
new file mode 100644
index 000000000..457cc5e39
--- /dev/null
+++ b/src/resources/textureatlas.h
@@ -0,0 +1,61 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_TEXTUREATLAS_H
+#define RESOURCES_TEXTUREATLAS_H
+
+#ifdef USE_OPENGL
+
+#include "utils/stringvector.h"
+
+#include <vector>
+
+#include <SDL.h>
+
+class AtlasResource;
+class Image;
+class Resource;
+
+struct AtlasItem;
+
+struct TextureAtlas final
+{
+ TextureAtlas() :
+ name(),
+ atlasImage(nullptr),
+ surface(nullptr),
+ width(0),
+ height(0),
+ items()
+ {
+ }
+
+ A_DELETE_COPY(TextureAtlas)
+
+ std::string name;
+ Image *atlasImage;
+ SDL_Surface *surface;
+ int width;
+ int height;
+ std::vector <AtlasItem*> items;
+};
+
+#endif // USE_OPENGL
+#endif // RESOURCES_TEXTUREATLAS_H