From 84189722a64c0794fbd918b4e6412908be2b7394 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Aug 2013 16:34:40 +0300 Subject: separate SDLGraphics and SDLImageHelper to 1.2 and 2. add missing sdlshared.h --- src/resources/sdl2imagehelper.cpp | 167 ++++++++++++++++++++++++++++++++++++++ src/resources/sdl2imagehelper.h | 100 +++++++++++++++++++++++ src/resources/sdlimagehelper.cpp | 15 +--- src/resources/sdlimagehelper.h | 6 ++ 4 files changed, 276 insertions(+), 12 deletions(-) create mode 100644 src/resources/sdl2imagehelper.cpp create mode 100644 src/resources/sdl2imagehelper.h (limited to 'src/resources') diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp new file mode 100644 index 000000000..07f6603e4 --- /dev/null +++ b/src/resources/sdl2imagehelper.cpp @@ -0,0 +1,167 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2013 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 . + */ + +#ifdef USE_SDL2 + +#include "resources/sdlimagehelper.h" + +#include "resources/dye.h" +#include "resources/resourcemanager.h" + +#include "client.h" +#include "logger.h" +#include "main.h" + +#include "resources/image.h" + +#include +#include + +#include "debug.h" + +bool SDLImageHelper::mEnableAlphaCache = false; + +Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const +{ + SDL_Surface *const tmpImage = loadPng(rw); + if (!tmpImage) + { + logger->log("Error, image load failed: %s", IMG_GetError()); + return nullptr; + } + + SDL_PixelFormat rgba; + rgba.palette = nullptr; + rgba.BitsPerPixel = 32; + rgba.BytesPerPixel = 4; + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + rgba.Rmask = 0x000000FF; + rgba.Gmask = 0x0000FF00; + rgba.Bmask = 0x00FF0000; + rgba.Amask = 0xFF000000; +#else + rgba.Rmask = 0xFF000000; + rgba.Gmask = 0x00FF0000; + rgba.Bmask = 0x0000FF00; + rgba.Amask = 0x000000FF; +#endif + + SDL_Surface *const surf = SDL_ConvertSurface( + tmpImage, &rgba, SDL_SWSURFACE); + SDL_FreeSurface(tmpImage); + + uint32_t *pixels = static_cast(surf->pixels); + const int type = dye.getType(); + + switch (type) + { + case 1: + { + const DyePalette *const pal = dye.getSPalete(); + if (pal) + pal->replaceSColor(pixels, surf->w * surf->h); + break; + } + case 2: + { + const DyePalette *const pal = dye.getAPalete(); + if (pal) + pal->replaceAColor(pixels, surf->w * surf->h); + break; + } + case 0: + default: + { + dye.normalDye(pixels, surf->w * surf->h); + break; + } + } + + Image *const image = load(surf); + SDL_FreeSurface(surf); + return image; +} + +Image *SDLImageHelper::load(SDL_Surface *const tmpImage) const +{ + return _SDLload(tmpImage); +} + +Image *SDLImageHelper::createTextSurface(SDL_Surface *const tmpImage, + const int width A_UNUSED, + const int height A_UNUSED, + const float alpha) const +{ + if (!tmpImage) + return nullptr; + + Image *img; + bool hasAlpha = false; + uint8_t *alphaChannel = nullptr; + SDL_Surface *image = SDLDuplicateSurface(tmpImage); + + img = new Image(image, hasAlpha, alphaChannel); + img->mAlpha = alpha; + return img; +} + +SDL_Surface* SDLImageHelper::SDLDuplicateSurface(SDL_Surface *const tmpImage) +{ + if (!tmpImage || !tmpImage->format) + return nullptr; + + return SDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE); +} + +Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) const +{ + if (!tmpImage) + return nullptr; + + return new Image(tmpImage, false, nullptr); +} + +int SDLImageHelper::useOpenGL() const +{ + return 0; +} + +SDL_Surface *SDLImageHelper::create32BitSurface(int width, int height) const +{ +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + const int rmask = 0xff000000; + const int gmask = 0x00ff0000; + const int bmask = 0x0000ff00; + const int amask = 0x000000ff; +#else + const int rmask = 0x000000ff; + const int gmask = 0x0000ff00; + const int bmask = 0x00ff0000; + const int amask = 0xff000000; +#endif + + return SDL_CreateRGBSurface(SDL_SWSURFACE, + width, height, 32, rmask, gmask, bmask, amask); +} + +#endif // USE_SDL2 diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h new file mode 100644 index 000000000..e0629aea3 --- /dev/null +++ b/src/resources/sdl2imagehelper.h @@ -0,0 +1,100 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2013 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_SDL2IMAGEHELPER_H +#define RESOURCES_SDL2IMAGEHELPER_H + +#ifdef USE_SDL2 + +#include "localconsts.h" + +#include "resources/imagehelper.h" + +#include + +class Dye; +class Image; + +/** + * Defines a class for loading and storing images. + */ +class SDLImageHelper final : public ImageHelper +{ + friend class Image; + + public: + SDLImageHelper() + { } + + A_DELETE_COPY(SDLImageHelper) + + virtual ~SDLImageHelper() + { } + + /** + * Loads an image from an SDL_RWops structure and recolors it. + * + * @param rw The SDL_RWops to load the image from. + * @param dye The dye used to recolor the image. + * + * @return NULL if an error occurred, a valid pointer + * otherwise. + */ + Image *load(SDL_RWops *const rw, + Dye const &dye) const override A_WARN_UNUSED; + + /** + * Loads an image from an SDL surface. + */ + Image *load(SDL_Surface *const tmpImage) const override A_WARN_UNUSED; + + Image *createTextSurface(SDL_Surface *const tmpImage, + const int width, const int height, + const float alpha) + const override A_WARN_UNUSED; + + static void SDLSetEnableAlphaCache(const bool n) + { mEnableAlphaCache = n; } + + static bool SDLGetEnableAlphaCache() A_WARN_UNUSED + { return mEnableAlphaCache; } + + /** + * Tells if the image was loaded using OpenGL or SDL + * @return true if OpenGL, false if SDL. + */ + int useOpenGL() const override A_WARN_UNUSED; + + static SDL_Surface* SDLDuplicateSurface(SDL_Surface *const tmpImage) + A_WARN_UNUSED; + + SDL_Surface *create32BitSurface(int width, int height) const override; + + protected: + /** SDL_Surface to SDL_Surface Image loader */ + Image *_SDLload(SDL_Surface *tmpImage) const A_WARN_UNUSED; + + static bool mEnableAlphaCache; +}; + +#endif // USE_SDL2 +#endif // RESOURCES_SDL2IMAGEHELPER_H diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 8f9d8b396..ca8978ded 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -20,6 +20,8 @@ * along with this program. If not, see . */ +#ifndef USE_SDL2 + #include "resources/sdlimagehelper.h" #include "resources/dye.h" @@ -51,10 +53,8 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const rgba.palette = nullptr; rgba.BitsPerPixel = 32; rgba.BytesPerPixel = 4; -#ifndef USE_SDL2 rgba.colorkey = 0; rgba.alpha = 255; -#endif #if SDL_BYTEORDER == SDL_BIG_ENDIAN rgba.Rmask = 0x000000FF; @@ -119,10 +119,6 @@ Image *SDLImageHelper::createTextSurface(SDL_Surface *const tmpImage, Image *img; bool hasAlpha = false; -#ifdef USE_SDL2 - uint8_t *alphaChannel = nullptr; - SDL_Surface *image = SDLDuplicateSurface(tmpImage); -#else const int sz = tmpImage->w * tmpImage->h; // The alpha channel to be filled with alpha values @@ -176,7 +172,6 @@ Image *SDLImageHelper::createTextSurface(SDL_Surface *const tmpImage, delete [] alphaChannel; return nullptr; } -#endif img = new Image(image, hasAlpha, alphaChannel); img->mAlpha = alpha; @@ -197,10 +192,6 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) const return nullptr; bool hasAlpha = false; -#ifdef USE_SDL2 - uint8_t *alphaChannel = nullptr; - SDL_Surface *image = tmpImage; -#else bool converted = false; if (tmpImage->format->BitsPerPixel != 32) @@ -280,7 +271,6 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage) const if (converted) SDL_FreeSurface(tmpImage); -#endif return new Image(image, hasAlpha, alphaChannel); } @@ -306,3 +296,4 @@ SDL_Surface *SDLImageHelper::create32BitSurface(int width, int height) const return SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, rmask, gmask, bmask, amask); } +#endif // USE_SDL2 diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 291345164..0aa3001b0 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -23,6 +23,11 @@ #ifndef RESOURCES_SDLIMAGEHELPER_H #define RESOURCES_SDLIMAGEHELPER_H +#ifdef USE_SDL2 +#include "sdl2imagehelper.h" + +#else + #include "localconsts.h" #include "resources/imagehelper.h" @@ -94,4 +99,5 @@ class SDLImageHelper final : public ImageHelper static bool mEnableAlphaCache; }; +#endif // USE_SDL2 #endif // RESOURCES_SDLIMAGEHELPER_H -- cgit v1.2.3-60-g2f50