From c18d789b35f29611c88d0e3bdbb5619500ea7a2a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 27 May 2016 21:37:03 +0300 Subject: Move spritedef load function from resourcemanager into separate file. --- src/resources/loaders/spritedefloader.cpp | 68 +++++++++++++++++++++++ src/resources/loaders/spritedefloader.h | 43 ++++++++++++++ src/resources/resourcemanager/resourcemanager.cpp | 28 +--------- src/resources/resourcemanager/resourcemanager.h | 8 --- src/resources/sprite/animatedsprite.cpp | 4 +- src/resources/sprite/animationdelayload.cpp | 4 +- 6 files changed, 117 insertions(+), 38 deletions(-) create mode 100644 src/resources/loaders/spritedefloader.cpp create mode 100644 src/resources/loaders/spritedefloader.h (limited to 'src/resources') diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp new file mode 100644 index 000000000..3c68b7c87 --- /dev/null +++ b/src/resources/loaders/spritedefloader.cpp @@ -0,0 +1,68 @@ +/* + * 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 . + */ + +#include "logger.h" +#include "settings.h" + +#include "resources/loaders/spritedefloader.h" + +#include "resources/resourcemanager/resourcemanager.h" + +#include "resources/sprite/spritedef.h" + +#include "utils/checkutils.h" +#include "utils/stringutils.h" + +#include "debug.h" + +namespace +{ + struct SpriteDefLoader final + { + std::string path; + int variant; + static Resource *load(const void *const v) + { + if (!v) + return nullptr; + + const SpriteDefLoader *const + rl = static_cast(v); + return SpriteDef::load(rl->path, + rl->variant, + settings.uselonglivesprites); + } + }; +} // namespace + +SpriteDef *Loader::getSprite(const std::string &path, + const int variant) +{ + SpriteDefLoader rl = { path, variant}; + const std::string str = std::string( + path).append( + "[").append(toString( + variant).append( + "]")); + return static_cast(resourceManager->get(str, + SpriteDefLoader::load, &rl)); +} diff --git a/src/resources/loaders/spritedefloader.h b/src/resources/loaders/spritedefloader.h new file mode 100644 index 000000000..58713756c --- /dev/null +++ b/src/resources/loaders/spritedefloader.h @@ -0,0 +1,43 @@ +/* + * 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 . + */ + +#ifndef RESOURCES_LOADERS_SPRITEDEFLOADER_H +#define RESOURCES_LOADERS_SPRITEDEFLOADER_H + +#include + +#include "localconsts.h" + +class SpriteDef; + +namespace Loader +{ + /** + * Creates a sprite definition based on a given path and the supplied + * variant. + */ + SpriteDef *getSprite(const std::string &path, + const int variant = 0) A_WARN_UNUSED; + +} // namespace Loader + +#endif // RESOURCES_LOADERS_SPRITEDEFLOADER_H diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index dd652c22b..2289fcffd 100644 --- a/src/resources/resourcemanager/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -72,8 +72,7 @@ ResourceManager::ResourceManager() : mOrphanedResources(), mDeletedResources(), mOldestOrphan(0), - mDestruction(0), - mUseLongLiveSprites(config.getBoolValue("uselonglivesprites")) + mDestruction(0) { logger->log1("Initializing resource manager..."); } @@ -527,31 +526,6 @@ Resource *ResourceManager::get(const std::string &idPath, return resource; } -struct SpriteDefLoader final -{ - std::string path; - int variant; - bool useLongLiveSprites; - static Resource *load(const void *const v) - { - if (!v) - return nullptr; - - const SpriteDefLoader *const - rl = static_cast(v); - return SpriteDef::load(rl->path, rl->variant, rl->useLongLiveSprites); - } -}; - -SpriteDef *ResourceManager::getSprite(const std::string &path, - const int variant) -{ - SpriteDefLoader rl = { path, variant, mUseLongLiveSprites }; - std::stringstream ss; - ss << path << "[" << variant << "]"; - return static_cast(get(ss.str(), SpriteDefLoader::load, &rl)); -} - void ResourceManager::release(Resource *const res) { if (!res || mDestruction) diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index 582359079..71643d1ac 100644 --- a/src/resources/resourcemanager/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -133,13 +133,6 @@ class ResourceManager final : public MemoryCounter */ bool addResource(const std::string &idPath, Resource *const resource); - /** - * Creates a sprite definition based on a given path and the supplied - * variant. - */ - SpriteDef *getSprite(const std::string &path, - const int variant = 0) A_WARN_UNUSED; - /** * Releases a resource, placing it in the set of orphaned resources. */ @@ -223,7 +216,6 @@ class ResourceManager final : public MemoryCounter std::set mDeletedResources; time_t mOldestOrphan; bool mDestruction; - bool mUseLongLiveSprites; }; extern ResourceManager *resourceManager; diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 6ada9c394..8a60de0f3 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -32,6 +32,8 @@ #include "resources/animation/animation.h" +#include "resources/loaders/spritedefloader.h" + #include "resources/resourcemanager/resourcemanager.h" #include "resources/sprite/animationdelayload.h" @@ -67,7 +69,7 @@ AnimatedSprite::AnimatedSprite(SpriteDef *restrict const sprite) : AnimatedSprite *AnimatedSprite::load(const std::string &restrict filename, const int variant) { - SpriteDef *restrict const s = resourceManager->getSprite( + SpriteDef *restrict const s = Loader::getSprite( filename, variant); if (!s) return nullptr; diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp index fa33ff5f5..838dad42d 100644 --- a/src/resources/sprite/animationdelayload.cpp +++ b/src/resources/sprite/animationdelayload.cpp @@ -22,7 +22,7 @@ #include "const/resources/spriteaction.h" -#include "resources/resourcemanager/resourcemanager.h" +#include "resources/loaders/spritedefloader.h" #include "resources/sprite/animatedsprite.h" @@ -56,7 +56,7 @@ void AnimationDelayLoad::load() { if (mSprite) { - SpriteDef *const s = resourceManager->getSprite(mFileName, mVariant); + SpriteDef *const s = Loader::getSprite(mFileName, mVariant); if (!s) return; mSprite->setSprite(s); -- cgit v1.2.3-70-g09d2