From 49a7df51386e49d51b7bdd626265f61be3833a3d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 18 May 2014 21:28:29 +0300 Subject: Move atlasitem into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/resources/atlasitem.h | 53 +++++++++++++++++++++++++++++++++++++++++ src/resources/atlasmanager.cpp | 1 + src/resources/atlasmanager.h | 22 +---------------- src/resources/atlasresource.cpp | 1 + 6 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 src/resources/atlasitem.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5cb0b3b65..f6dd8a190 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -510,6 +510,7 @@ SET(SRCS resources/ambientlayer.h resources/animation.cpp resources/animation.h + resources/atlasitem.h resources/atlasmanager.cpp resources/atlasmanager.h resources/atlasresource.cpp diff --git a/src/Makefile.am b/src/Makefile.am index f6d56adc0..c9bc36ef4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -615,6 +615,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/ambientlayer.h \ resources/animation.cpp \ resources/animation.h \ + resources/atlasitem.h \ resources/atlasmanager.cpp \ resources/atlasmanager.h \ resources/atlasresource.cpp \ diff --git a/src/resources/atlasitem.h b/src/resources/atlasitem.h new file mode 100644 index 000000000..e3e35646b --- /dev/null +++ b/src/resources/atlasitem.h @@ -0,0 +1,53 @@ +/* + * 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 . + */ + +#ifndef RESOURCES_ATLASITEM_H +#define RESOURCES_ATLASITEM_H + +#ifdef USE_OPENGL + +#include "resources/image.h" + +#include + +struct AtlasItem final +{ + explicit AtlasItem(Image *const image0) : + image(image0), + name(), + x(0), + y(0), + width(image0->mBounds.w), + height(image0->mBounds.h) + { + } + + A_DELETE_COPY(AtlasItem) + + Image *image; + std::string name; + int x; + int y; + int width; + int height; +}; + +#endif // USE_OPENGL +#endif // RESOURCES_ATLASITEM_H diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index e2a801a78..01a1a0b91 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -31,6 +31,7 @@ #include "utils/physfsrwops.h" #include "utils/sdlcheckutils.h" +#include "resources/atlasitem.h" #include "resources/atlasresource.h" #include "resources/dye.h" #include "resources/imagehelper.h" diff --git a/src/resources/atlasmanager.h b/src/resources/atlasmanager.h index cf461cc23..8fb2d6dcc 100644 --- a/src/resources/atlasmanager.h +++ b/src/resources/atlasmanager.h @@ -32,27 +32,7 @@ class AtlasResource; class Resource; -struct AtlasItem final -{ - explicit AtlasItem(Image *const image0) : - image(image0), - name(), - x(0), - y(0), - width(image0->mBounds.w), - height(image0->mBounds.h) - { - } - - A_DELETE_COPY(AtlasItem) - - Image *image; - std::string name; - int x; - int y; - int width; - int height; -}; +struct AtlasItem; struct TextureAtlas final { diff --git a/src/resources/atlasresource.cpp b/src/resources/atlasresource.cpp index f83c8c4f6..26edd2828 100644 --- a/src/resources/atlasresource.cpp +++ b/src/resources/atlasresource.cpp @@ -24,6 +24,7 @@ #include "resources/atlasresource.h" +#include "resources/atlasitem.h" #include "resources/atlasmanager.h" #include "resources/resourcemanager.h" -- cgit v1.2.3-60-g2f50