summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gui/widgets/desktop.cpp4
-rw-r--r--src/resources/ambientlayer.cpp4
-rw-r--r--src/resources/loaders/rescaledloader.cpp77
-rw-r--r--src/resources/loaders/rescaledloader.h37
-rw-r--r--src/resources/resourcemanager/resourcemanager.cpp40
-rw-r--r--src/resources/resourcemanager/resourcemanager.h4
8 files changed, 125 insertions, 47 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2fa0e59f7..3bbe3bb9c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -727,6 +727,8 @@ SET(SRCS
resources/loaders/imagesetloader.h
resources/loaders/musicloader.cpp
resources/loaders/musicloader.h
+ resources/loaders/rescaledloader.cpp
+ resources/loaders/rescaledloader.h
resources/loaders/shaderloader.cpp
resources/loaders/shaderloader.h
resources/loaders/shaderprogramloader.cpp
@@ -1437,6 +1439,8 @@ SET(DYE_CMD_SRCS
resources/loaders/imagesetloader.h
resources/loaders/musicloader.cpp
resources/loaders/musicloader.h
+ resources/loaders/rescaledloader.cpp
+ resources/loaders/rescaledloader.h
resources/loaders/shaderloader.cpp
resources/loaders/shaderloader.h
resources/loaders/shaderprogramloader.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a292b6a8c..e70aaf2fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -398,6 +398,8 @@ SRC += events/actionevent.h \
resources/loaders/imagesetloader.h \
resources/loaders/musicloader.cpp \
resources/loaders/musicloader.h \
+ resources/loaders/rescaledloader.cpp \
+ resources/loaders/rescaledloader.h \
resources/loaders/shaderloader.cpp \
resources/loaders/shaderloader.h \
resources/loaders/shaderprogramloader.cpp \
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 701145440..6c939db5c 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -35,6 +35,8 @@
#include "resources/imagehelper.h"
#include "resources/wallpaper.h"
+#include "resources/loaders/rescaledloader.h"
+
#include "resources/resourcemanager/resourcemanager.h"
#include "render/graphics.h"
@@ -190,7 +192,7 @@ void Desktop::setBestFittingWallpaper()
nWallPaper->getHeight() != height))
{
// We rescale to obtain a fullscreen wallpaper...
- Image *const newRsclWlPpr = resourceManager->getRescaled(
+ Image *const newRsclWlPpr = Loader::getRescaled(
nWallPaper, width, height);
if (newRsclWlPpr)
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 6c8e22893..f75300367 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -28,7 +28,7 @@
#include "resources/image.h"
#include "resources/imagehelper.h"
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/loaders/rescaledloader.h"
#include "debug.h"
@@ -66,7 +66,7 @@ AmbientLayer::AmbientLayer(const std::string &name,
{
// Rescale the overlay to keep the ratio as if we were on
// the default resolution...
- Image *const rescaledOverlay = resourceManager->getRescaled(
+ Image *const rescaledOverlay = Loader::getRescaled(
mImage,
CAST_S32(mImage->mBounds.w) /
defaultScreenWidth * width,
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
new file mode 100644
index 000000000..95ef6dff7
--- /dev/null
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -0,0 +1,77 @@
+/*
+ * 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/rescaledloader.h"
+
+#include "resources/resourcemanager/resourcemanager.h"
+
+#include "utils/checkutils.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+namespace
+{
+ struct RescaledLoader final
+ {
+ const Image *image;
+ int width;
+ int height;
+ static Resource *load(const void *const v)
+ {
+ if (!v)
+ return nullptr;
+ const RescaledLoader *const rl
+ = static_cast<const RescaledLoader *const>(v);
+ if (!rl->image)
+ return nullptr;
+ Image *const rescaled = rl->image->SDLgetScaledImage(
+ rl->width, rl->height);
+ if (!rescaled)
+ {
+ reportAlways("Rescale image failed: %s",
+ rl->image->getIdPath().c_str());
+ return nullptr;
+ }
+ return rescaled;
+ }
+ };
+} // namespace
+
+Image *Loader::getRescaled(const Image *const image,
+ const int width,
+ const int height)
+{
+ if (!image)
+ return nullptr;
+
+ const std::string idPath = image->getIdPath() + strprintf(
+ "_rescaled%dx%d", width, height);
+ const RescaledLoader rl = { image, width, height };
+ Image *const img = static_cast<Image *const>(
+ resourceManager->get(idPath, RescaledLoader::load, &rl));
+ return img;
+}
diff --git a/src/resources/loaders/rescaledloader.h b/src/resources/loaders/rescaledloader.h
new file mode 100644
index 000000000..330f3eaa0
--- /dev/null
+++ b/src/resources/loaders/rescaledloader.h
@@ -0,0 +1,37 @@
+/*
+ * 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_RESCALEDLOADER_H
+#define RESOURCES_LOADERS_RESCALEDLOADER_H
+
+#include "localconsts.h"
+
+class Image;
+
+namespace Loader
+{
+ Image *getRescaled(const Image *const image,
+ const int width,
+ const int height) A_WARN_UNUSED;
+} // namespace Loader
+
+#endif // RESOURCES_LOADERS_RESCALEDLOADER_H
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 2289fcffd..b2d4d483d 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -698,46 +698,6 @@ void ResourceManager::clearScheduled()
BLOCK_END("ResourceManager::clearScheduled")
}
-struct RescaledLoader final
-{
- ResourceManager *manager;
- const Image *image;
- int width;
- int height;
- static Resource *load(const void *const v)
- {
- if (!v)
- return nullptr;
- const RescaledLoader *const rl
- = static_cast<const RescaledLoader *const>(v);
- if (!rl->manager || !rl->image)
- return nullptr;
- Image *const rescaled = rl->image->SDLgetScaledImage(
- rl->width, rl->height);
- if (!rescaled)
- {
- reportAlways("Rescale image failed: %s",
- rl->image->getIdPath().c_str());
- return nullptr;
- }
- return rescaled;
- }
-};
-
-Image *ResourceManager::getRescaled(const Image *const image,
- const int width, const int height)
-{
- if (!image)
- return nullptr;
-
- std::string idPath = image->getIdPath() + strprintf(
- "_rescaled%dx%d", width, height);
- const RescaledLoader rl = { this, image, width, height };
- Image *const img = static_cast<Image *const>(
- get(idPath, RescaledLoader::load, &rl));
- return img;
-}
-
void ResourceManager::clearCache()
{
cleanProtected();
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index 71643d1ac..caad4bb6e 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -147,10 +147,6 @@ class ResourceManager final : public MemoryCounter
*/
void moveToDeleted(Resource *const res);
- Image *getRescaled(const Image *const image,
- const int width,
- const int height) A_WARN_UNUSED;
-
/**
* Loads the given filename as an SDL surface. The returned surface is
* expected to be freed by the caller using SDL_FreeSurface.