diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/loaders/subimageloader.cpp | 89 | ||||
| -rw-r--r-- | src/resources/loaders/subimageloader.h | 39 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.cpp | 42 | ||||
| -rw-r--r-- | src/resources/resourcemanager/resourcemanager.h | 3 |
4 files changed, 128 insertions, 45 deletions
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp new file mode 100644 index 000000000..9d61a305d --- /dev/null +++ b/src/resources/loaders/subimageloader.cpp @@ -0,0 +1,89 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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/>. + */ + +#include "logger.h" + +#include "resources/image.h" + +#include "resources/loaders/subimageloader.h" + +#include "resources/resourcemanager/resourcemanager.h" + +#include "utils/checkutils.h" +#include "utils/physfsrwops.h" +#include "utils/stringutils.h" + +#include "debug.h" + +namespace +{ + struct SubImageLoader final + { + Image *parent; + int x, y; + int width, height; + static Resource *load(const void *const v) + { + if (!v) + return nullptr; + + const SubImageLoader *const + rl = static_cast<const SubImageLoader *const>(v); + if (!rl->parent) + return nullptr; + + Image *const res = rl->parent->getSubImage(rl->x, rl->y, + rl->width, rl->height); + if (!res) + { + reportAlways("SubImage loading error: %s", + rl->parent->getSource().c_str()); + } + return res; + } + }; +} // namespace + +Image *Loader::getSubImage(Image *const parent, + const int x, + const int y, + const int width, + const int height) +{ + if (!parent) + return nullptr; + + const SubImageLoader rl = { parent, x, y, width, height}; + + const std::string str = std::string(parent->getIdPath()).append( + ",[").append( + toString(x)).append( + ",").append( + toString(y)).append( + ",").append( + toString(width)).append( + "x").append( + toString(height)).append( + "]"); + return static_cast<Image*>(resourceManager->get(str, + SubImageLoader::load, &rl)); +} diff --git a/src/resources/loaders/subimageloader.h b/src/resources/loaders/subimageloader.h new file mode 100644 index 000000000..222c967e1 --- /dev/null +++ b/src/resources/loaders/subimageloader.h @@ -0,0 +1,39 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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_RESOURCEMANAGER_SUBIMAGELOADER_H +#define RESOURCES_RESOURCEMANAGER_SUBIMAGELOADER_H + +#include "localconsts.h" + +class Image; + +namespace Loader +{ + Image *getSubImage(Image *const parent, + const int x, + const int y, + const int width, + const int height) A_WARN_UNUSED; +} // namespace SubImageLoader + +#endif // RESOURCES_RESOURCEMANAGER_SUBIMAGELOADER_H diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 0cff0fb2c..e9b8c687b 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -596,48 +596,6 @@ ImageSet *ResourceManager::getSubImageSet(Image *const parent, SubImageSetLoader::load, &rl)); } -struct SubImageLoader final -{ - ResourceManager *manager; - Image *parent; - int x, y; - int width, height; - static Resource *load(const void *const v) - { - if (!v) - return nullptr; - - const SubImageLoader *const - rl = static_cast<const SubImageLoader *const>(v); - if (!rl->manager || !rl->parent) - return nullptr; - - Image *const res = rl->parent->getSubImage(rl->x, rl->y, - rl->width, rl->height); - if (!res) - { - reportAlways("SubImage loading error: %s", - rl->parent->getSource().c_str()); - } - return res; - } -}; - -Image *ResourceManager::getSubImage(Image *const parent, - const int x, const int y, - const int width, const int height) -{ - if (!parent) - return nullptr; - - const SubImageLoader rl = { this, parent, x, y, width, height}; - - std::stringstream ss; - ss << parent->getIdPath() << ",[" << x << "," << y << "," - << width << "x" << height << "]"; - return static_cast<Image*>(get(ss.str(), SubImageLoader::load, &rl)); -} - #ifdef USE_OPENGL struct AtlasLoader final { diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index 1cc4fab68..13c99df63 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -144,9 +144,6 @@ class ResourceManager final : public MemoryCounter const int width, const int height) A_WARN_UNUSED; - Image *getSubImage(Image *const parent, const int x, const int y, - const int width, const int height) A_WARN_UNUSED; - #ifdef USE_OPENGL Resource *getAtlas(const std::string &name, const StringVect &files) A_WARN_UNUSED; |