summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 14:13:51 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 14:13:51 +0300
commite2f03241a1ba9d6b536b0b7a6f995e4e8d894408 (patch)
tree2bfd5cda7899a5793de62b5f47925a09eac320f5 /src/resources/loaders
parent59271755dc75f5de6c288308df92f687deaa32b4 (diff)
downloadmv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.gz
mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.bz2
mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.tar.xz
mv-e2f03241a1ba9d6b536b0b7a6f995e4e8d894408.zip
Move images load function from resourcemanager into separate file.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/imageloader.cpp88
-rw-r--r--src/resources/loaders/imageloader.h41
2 files changed, 129 insertions, 0 deletions
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
new file mode 100644
index 000000000..936d9b090
--- /dev/null
+++ b/src/resources/loaders/imageloader.cpp
@@ -0,0 +1,88 @@
+/*
+ * 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/imagehelper.h"
+
+#include "resources/loaders/imageloader.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
+
+#include "resources/dye/dye.h"
+
+#include "utils/checkutils.h"
+#include "utils/physfsrwops.h"
+
+#include "debug.h"
+
+namespace
+{
+ struct DyedImageLoader final
+ {
+ std::string path;
+ static Resource *load(const void *const v)
+ {
+ BLOCK_START("DyedImageLoader::load")
+ if (!v)
+ {
+ BLOCK_END("DyedImageLoader::load")
+ return nullptr;
+ }
+
+ const DyedImageLoader *const rl
+ = static_cast<const DyedImageLoader *const>(v);
+
+ std::string path1 = rl->path;
+ const size_t p = path1.find('|');
+ Dye *d = nullptr;
+ if (p != std::string::npos)
+ {
+ d = new Dye(path1.substr(p + 1));
+ path1 = path1.substr(0, p);
+ }
+ SDL_RWops *const rw = MPHYSFSRWOPS_openRead(path1.c_str());
+ if (!rw)
+ {
+ delete d;
+ reportAlways("Image loading error: %s", path1.c_str());
+ BLOCK_END("DyedImageLoader::load")
+ return nullptr;
+ }
+ Resource *const res = d ? imageHelper->load(rw, *d)
+ : imageHelper->load(rw);
+ delete d;
+ if (!res)
+ reportAlways("Image loading error: %s", path1.c_str());
+ BLOCK_END("DyedImageLoader::load")
+ return res;
+ }
+ };
+} // namespace
+
+Image *ImageLoader::getImage(const std::string &idPath)
+{
+ DyedImageLoader rl = { idPath };
+ return static_cast<Image*>(resourceManager->get(idPath,
+ DyedImageLoader::load, &rl));
+}
diff --git a/src/resources/loaders/imageloader.h b/src/resources/loaders/imageloader.h
new file mode 100644
index 000000000..6d60782a5
--- /dev/null
+++ b/src/resources/loaders/imageloader.h
@@ -0,0 +1,41 @@
+/*
+ * 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_LOADERS_IMAGELOADER_H
+#define RESOURCES_LOADERS_IMAGELOADER_H
+
+#include "localconsts.h"
+
+#include <string>
+
+class Image;
+
+namespace ImageLoader
+{
+ /**
+ * Convenience wrapper around ResourceManager::get for loading
+ * images.
+ */
+ Image *getImage(const std::string &idPath) A_WARN_UNUSED;
+} // namespace ImageLoader
+
+#endif // RESOURCES_LOADERS_IMAGELOADER_H