From 2ab3f0d8d04374b330c91a9f065efa0f526d7824 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 1 Sep 2013 20:50:30 +0300 Subject: add software renderer for SDL2. before it used default renderer with software flags. --- src/resources/image.cpp | 10 +- src/resources/image.h | 2 + src/resources/sdl2softwareimagehelper.cpp | 184 ++++++++++++++++++++++++++++++ src/resources/sdl2softwareimagehelper.h | 113 ++++++++++++++++++ 4 files changed, 304 insertions(+), 5 deletions(-) create mode 100644 src/resources/sdl2softwareimagehelper.cpp create mode 100644 src/resources/sdl2softwareimagehelper.h (limited to 'src/resources') diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c289c90cd..1a327eae1 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -42,9 +42,7 @@ #include "utils/sdlcheckutils.h" #include -#ifndef USE_SDL2 #include -#endif #include "debug.h" @@ -388,7 +386,6 @@ Image* Image::SDLgetScaledImage(const int width, const int height) const Image* scaledImage = nullptr; -#ifndef USE_SDL2 if (mSDLSurface) { SDL_Surface *const scaledSurface = zoomSurface(mSDLSurface, @@ -404,7 +401,6 @@ Image* Image::SDLgetScaledImage(const int width, const int height) const MSDL_FreeSurface(scaledSurface); } } -#endif return scaledImage; } @@ -423,7 +419,11 @@ Image *Image::getSubImage(const int x, const int y, #endif #ifdef USE_SDL2 - return new SubImage(this, mTexture, x, y, width, height); + // +++ probably default sdl render is broken here + if (mode == RENDER_SOFTWARE) + return new SubImage(this, mSDLSurface, x, y, width, height); + else + return new SubImage(this, mTexture, x, y, width, height); #else return new SubImage(this, mSDLSurface, x, y, width, height); #endif diff --git a/src/resources/image.h b/src/resources/image.h index 7cdb1b5b3..664642e3a 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -61,6 +61,8 @@ class Image : public Resource friend class SDLImageHelper; friend class SurfaceGraphics; #ifdef USE_SDL2 + friend class SDL2SoftwareGraphics; + friend class SDL2SoftwareImageHelper; friend class SurfaceImageHelper; #endif friend class TestLauncher; diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp new file mode 100644 index 000000000..3511b8298 --- /dev/null +++ b/src/resources/sdl2softwareimagehelper.cpp @@ -0,0 +1,184 @@ +/* + * 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/sdl2softwareimagehelper.h" + +#include "resources/dye.h" +#include "resources/resourcemanager.h" + +#include "client.h" +#include "logger.h" +#include "main.h" + +#include "resources/image.h" + +#include "utils/sdlcheckutils.h" + +#include + +#include "debug.h" + +bool SDL2SoftwareImageHelper::mEnableAlphaCache = false; +SDL_Renderer *SDL2SoftwareImageHelper::mRenderer = nullptr; + +Image *SDL2SoftwareImageHelper::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 = MSDL_ConvertSurface( + tmpImage, &rgba, SDL_SWSURFACE); + MSDL_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); + MSDL_FreeSurface(surf); + return image; +} + +Image *SDL2SoftwareImageHelper::load(SDL_Surface *const tmpImage) const +{ + return _SDLload(tmpImage); +} + +Image *SDL2SoftwareImageHelper::createTextSurface(SDL_Surface *const tmpImage, + const int width A_UNUSED, + const int height A_UNUSED, + const float alpha) const +{ + if (!tmpImage) + return nullptr; + + Image *const img = _SDLload(tmpImage); + if (img) + img->setAlpha(alpha); + return img; +} + +SDL_Surface* SDL2SoftwareImageHelper::SDLDuplicateSurface(SDL_Surface *const + tmpImage) +{ + if (!tmpImage || !tmpImage->format) + return nullptr; + + return MSDL_ConvertSurface(tmpImage, tmpImage->format, SDL_SWSURFACE); +} + +Image *SDL2SoftwareImageHelper::_SDLload(SDL_Surface *tmpImage) const +{ + if (!tmpImage) + return nullptr; + +// SDL_Texture *const texture = SDL_CreateTextureFromSurface( +// mRenderer, tmpImage); +// if (!texture) +// return nullptr; +// SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND); +// return new Image(texture, tmpImage->w, tmpImage->h); + SDL_Surface *image = convertTo32Bit(tmpImage); + return new Image(image, false, nullptr); +} + +RenderType SDL2SoftwareImageHelper::useOpenGL() const +{ + return RENDER_SOFTWARE; +} + +SDL_Surface *SDL2SoftwareImageHelper::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 MSDL_CreateRGBSurface(SDL_SWSURFACE, + width, height, 32, rmask, gmask, bmask, amask); +} + +int SDL2SoftwareImageHelper::combineSurface(SDL_Surface *const src, + SDL_Rect *const srcrect, + SDL_Surface *const dst, + SDL_Rect *const dstrect) +{ + SDL_SetSurfaceBlendMode(src, SDL_BLENDMODE_BLEND); + SDL_BlitSurface(src, srcrect, dst, dstrect); + return 1; +} + +#endif // USE_SDL2 diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h new file mode 100644 index 000000000..877ae9032 --- /dev/null +++ b/src/resources/sdl2softwareimagehelper.h @@ -0,0 +1,113 @@ +/* + * 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_SDL2SOFTWAREIMAGEHELPER_H +#define RESOURCES_SDL2SOFTWAREIMAGEHELPER_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 SDL2SoftwareImageHelper final : public ImageHelper +{ + friend class Image; + + public: + SDL2SoftwareImageHelper() + { } + + A_DELETE_COPY(SDL2SoftwareImageHelper) + + virtual ~SDL2SoftwareImageHelper() + { } + + /** + * 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. + */ + RenderType 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; + + static int combineSurface(SDL_Surface *const src, + SDL_Rect *const srcrect, + SDL_Surface *const dst, + SDL_Rect *const dstrect); + +#ifdef USE_SDL2 + static void setRenderer(SDL_Renderer *const renderer) + { mRenderer = renderer; } +#endif + + protected: + /** SDL_Surface to SDL_Surface Image loader */ + Image *_SDLload(SDL_Surface *tmpImage) const A_WARN_UNUSED; + + static bool mEnableAlphaCache; +#ifdef USE_SDL2 + static SDL_Renderer *mRenderer; +#endif +}; + +#endif // USE_SDL2 +#endif // RESOURCES_SDL2SOFTWAREIMAGEHELPER_H -- cgit v1.2.3-70-g09d2