From 1d71d02a40dc1f4c50572bf0681bbc2907a3c361 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 17 Feb 2014 22:16:29 +0300 Subject: move sdlpixel file into utils directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/gui/base/sdl/sdlpixel.hpp | 306 ------------------------------------ src/render/sdl2graphics.cpp | 2 +- src/render/sdl2softwaregraphics.cpp | 4 +- src/render/sdlgraphics.cpp | 4 +- src/utils/sdlpixel.h | 232 +++++++++++++++++++++++++++ 7 files changed, 239 insertions(+), 313 deletions(-) delete mode 100644 src/gui/base/sdl/sdlpixel.hpp create mode 100644 src/utils/sdlpixel.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 711d9e47b..cdc61aa91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -782,7 +782,7 @@ SET(SRCS gui/base/rectangle.hpp events/selectionevent.h listeners/selectionlistener.h - gui/base/sdl/sdlpixel.hpp + utils/sdlpixel.h gui/base/widget.hpp listeners/widgetlistener.h gui/base/widgets/button.hpp diff --git a/src/Makefile.am b/src/Makefile.am index f20376feb..246da6073 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,7 +168,7 @@ manaplus_SOURCES += events/actionevent.h \ gui/base/rectangle.hpp \ events/selectionevent.h \ listeners/selectionlistener.h \ - gui/base/sdl/sdlpixel.hpp \ + utils/sdlpixel.h \ gui/base/widget.hpp \ listeners/widgetlistener.h \ gui/base/widgets/button.hpp \ diff --git a/src/gui/base/sdl/sdlpixel.hpp b/src/gui/base/sdl/sdlpixel.hpp deleted file mode 100644 index 06a22f65f..000000000 --- a/src/gui/base/sdl/sdlpixel.hpp +++ /dev/null @@ -1,306 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2014 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 . - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GCN_SDLPIXEL_HPP -#define GCN_SDLPIXEL_HPP - -#include "SDL.h" -#include "gui/base/color.hpp" - -namespace gcn -{ - - /** - * Checks a pixels color of an SDL_Surface. - * - * @param surface an SDL_Surface where to check for a pixel color. - * @param x the x coordinate on the surface. - * @param y the y coordinate on the surface. - * @return a color of a pixel. - */ - inline const Color SDLgetPixel(SDL_Surface* surface, int x, int y) - { - if (!surface) - return Color(0, 0, 0, 0); - - int bpp = surface->format->BytesPerPixel; - - SDL_LockSurface(surface); - - Uint8 *p = static_cast(surface->pixels) - + y * surface->pitch + x * bpp; - - unsigned int color = 0; - - switch (bpp) - { - case 1: - color = *p; - break; - - case 2: - color = *reinterpret_cast(p); - break; - - case 3: -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - color = p[0] << 16 | p[1] << 8 | p[2]; -#else - color = p[0] | p[1] << 8 | p[2] << 16; -#endif - break; - - case 4: - color = *reinterpret_cast(p); - break; - - default: - color = *p; - break; - } - - unsigned char r, g, b, a; - - SDL_GetRGBA(color, surface->format, &r, &g, &b, &a); - SDL_UnlockSurface(surface); - - return Color(r, g, b, a); - } - - /** - * Puts a pixel on an SDL_Surface. - * - * @param x the x coordinate on the surface. - * @param y the y coordinate on the surface. - * @param color the color the pixel should be in. - */ - inline void SDLputPixel(SDL_Surface* surface, int x, int y, - const Color& color) - { - if (!surface) - return; - - int bpp = surface->format->BytesPerPixel; - - SDL_LockSurface(surface); - - Uint8 *p = static_cast(surface->pixels) - + y * surface->pitch + x * bpp; - - Uint32 pixel = SDL_MapRGB(surface->format, - static_cast(color.r), static_cast(color.g), - static_cast(color.b)); - - switch (bpp) - { - case 1: - *p = static_cast(pixel); - break; - - case 2: - *reinterpret_cast(p) = static_cast(pixel); - break; - - case 3: -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - p[0] = static_cast((pixel >> 16) & 0xff); - p[1] = static_cast((pixel >> 8) & 0xff); - p[2] = static_cast((pixel) & 0xff); -#else - p[0] = static_cast((pixel) & 0xff); - p[1] = static_cast((pixel >> 8) & 0xff); - p[2] = static_cast((pixel >> 16) & 0xff); -#endif - break; - - case 4: - *reinterpret_cast(p) = pixel; - break; - - default: - break; - } - - SDL_UnlockSurface(surface); - } - - /** - * Blends two 32 bit colors together. - * - * @param src the source color. - * @param dst the destination color. - * @param a alpha. - */ - inline unsigned int SDLAlpha32(unsigned int src, unsigned int dst, - unsigned char a) - { - unsigned int b = ((src & 0xff) * a + (dst & 0xff) * (255 - a)) >> 8; - unsigned int g = ((src & 0xff00) * a + (dst & 0xff00) - * (255 - a)) >> 8; - unsigned int r = ((src & 0xff0000) * a + (dst & 0xff0000) - * (255 - a)) >> 8; - - return (b & 0xff) | (g & 0xff00) | (r & 0xff0000); - } - - /** - * Blends two 16 bit colors together. - * - * @param src the source color. - * @param dst the destination color. - * @param a alpha. - */ - inline unsigned short SDLAlpha16(unsigned short src, unsigned short dst, - unsigned char a, const SDL_PixelFormat *f) - { - unsigned int b = ((src & f->Rmask) * a + (dst & f->Rmask) - * (255 - a)) >> 8; - unsigned int g = ((src & f->Gmask) * a + (dst & f->Gmask) - * (255 - a)) >> 8; - unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask) - * (255 - a)) >> 8; - - return static_cast((b & f->Rmask) - | (g & f->Gmask) | (r & f->Bmask)); - } - - /* - typedef struct{ - SDL_Palette *palette; - Uint8 BitsPerPixel; - Uint8 BytesPerPixel; - Uint32 Rmask, Gmask, Bmask, Amask; - Uint8 Rshift, Gshift, Bshift, Ashift; - Uint8 Rloss, Gloss, Bloss, Aloss; - Uint32 colorkey; - Uint8 alpha; - } SDL_PixelFormat; - */ - - /** - * Puts a pixel on an SDL_Surface with alpha - * - * @param x the x coordinate on the surface. - * @param y the y coordinate on the surface. - * @param color the color the pixel should be in. - */ - inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y, - const Color& color) - { - int bpp = surface->format->BytesPerPixel; - - SDL_LockSurface(surface); - - Uint8 *p = static_cast(surface->pixels) - + y * surface->pitch + x * bpp; - - Uint32 pixel = SDL_MapRGB(surface->format, - static_cast(color.r), - static_cast(color.g), - static_cast(color.b)); - - switch (bpp) - { - case 1: - *p = static_cast(pixel); - break; - - case 2: - *reinterpret_cast(p) = SDLAlpha16( - static_cast(pixel), - *reinterpret_cast(p), - static_cast(color.a), surface->format); - break; - - case 3: -#if SDL_BYTEORDER == SDL_BIG_ENDIAN - p[2] = static_cast((p[2] * (255 - color.a) - + color.b * color.a) >> 8); - p[1] = static_cast((p[1] * (255 - color.a) - + color.g * color.a) >> 8); - p[0] = static_cast((p[0] * (255 - color.a) - + color.r * color.a) >> 8); -#else - p[0] = static_cast((p[0] * (255 - color.a) - + color.b * color.a) >> 8); - p[1] = static_cast((p[1] * (255 - color.a) - + color.g * color.a) >> 8); - p[2] = static_cast((p[2] * (255 - color.a) - + color.r * color.a) >> 8); -#endif - break; - - case 4: - *reinterpret_cast(p) = SDLAlpha32(pixel, - *reinterpret_cast(p), - static_cast(color.a)); - break; - default: - break; - } - - SDL_UnlockSurface(surface); - } -} // namespace gcn - -#endif // end GCN_SDLPIXEL_HPP diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 46d8360b6..2cd7c965e 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -79,7 +79,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index e78a87c7e..8efd73d68 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -36,7 +36,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -967,7 +967,7 @@ void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast(p) = gcn::SDLAlpha16( + *reinterpret_cast(p) = SDLAlpha16( static_cast(pixel), *reinterpret_cast(p), static_cast(mColor.a), mSurface->format); diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 2226be0da..7a15713be 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -31,7 +31,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -963,7 +963,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast(p) = gcn::SDLAlpha16( + *reinterpret_cast(p) = SDLAlpha16( static_cast(pixel), *reinterpret_cast(p), static_cast(mColor.a), mWindow->format); diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h new file mode 100644 index 000000000..2a26f28a1 --- /dev/null +++ b/src/utils/sdlpixel.h @@ -0,0 +1,232 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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 . + */ + +/* _______ __ __ __ ______ __ __ _______ __ __ + * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ + * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / + * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / + * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / + * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / + * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ + * + * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson + * + * + * Per Larsson a.k.a finalman + * Olof Naessén a.k.a jansem/yakslem + * + * Visit: http://guichan.sourceforge.net + * + * License: (BSD) + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name of Guichan nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef UTILS_SDLPIXEL_HPP +#define UTILS_SDLPIXEL_HPP + +#include "SDL.h" +#include "gui/base/color.hpp" + +/** + * Puts a pixel on an SDL_Surface. + * + * @param x the x coordinate on the surface. + * @param y the y coordinate on the surface. + * @param color the color the pixel should be in. + */ +inline void SDLputPixel(SDL_Surface* surface, int x, int y, + const gcn::Color& color) +{ + if (!surface) + return; + + int bpp = surface->format->BytesPerPixel; + + SDL_LockSurface(surface); + + Uint8 *p = static_cast(surface->pixels) + + y * surface->pitch + x * bpp; + + Uint32 pixel = SDL_MapRGB(surface->format, + static_cast(color.r), static_cast(color.g), + static_cast(color.b)); + + switch (bpp) + { + case 1: + *p = static_cast(pixel); + break; + + case 2: + *reinterpret_cast(p) = static_cast(pixel); + break; + + case 3: +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + p[0] = static_cast((pixel >> 16) & 0xff); + p[1] = static_cast((pixel >> 8) & 0xff); + p[2] = static_cast((pixel) & 0xff); +#else + p[0] = static_cast((pixel) & 0xff); + p[1] = static_cast((pixel >> 8) & 0xff); + p[2] = static_cast((pixel >> 16) & 0xff); +#endif + break; + + case 4: + *reinterpret_cast(p) = pixel; + break; + + default: + break; + } + + SDL_UnlockSurface(surface); +} + +/** + * Blends two 32 bit colors together. + * + * @param src the source color. + * @param dst the destination color. + * @param a alpha. + */ +inline unsigned int SDLAlpha32(unsigned int src, unsigned int dst, + unsigned char a) +{ + unsigned int b = ((src & 0xff) * a + (dst & 0xff) * (255 - a)) >> 8; + unsigned int g = ((src & 0xff00) * a + (dst & 0xff00) + * (255 - a)) >> 8; + unsigned int r = ((src & 0xff0000) * a + (dst & 0xff0000) + * (255 - a)) >> 8; + + return (b & 0xff) | (g & 0xff00) | (r & 0xff0000); +} + +/** + * Blends two 16 bit colors together. + * + * @param src the source color. + * @param dst the destination color. + * @param a alpha. + */ +inline unsigned short SDLAlpha16(unsigned short src, unsigned short dst, + unsigned char a, const SDL_PixelFormat *f) +{ + unsigned int b = ((src & f->Rmask) * a + (dst & f->Rmask) + * (255 - a)) >> 8; + unsigned int g = ((src & f->Gmask) * a + (dst & f->Gmask) + * (255 - a)) >> 8; + unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask) + * (255 - a)) >> 8; + + return static_cast((b & f->Rmask) + | (g & f->Gmask) | (r & f->Bmask)); +} + +/** + * Puts a pixel on an SDL_Surface with alpha + * + * @param x the x coordinate on the surface. + * @param y the y coordinate on the surface. + * @param color the color the pixel should be in. + */ +inline void SDLputPixelAlpha(SDL_Surface* surface, int x, int y, + const gcn::Color& color) +{ + int bpp = surface->format->BytesPerPixel; + + SDL_LockSurface(surface); + + Uint8 *p = static_cast(surface->pixels) + + y * surface->pitch + x * bpp; + + Uint32 pixel = SDL_MapRGB(surface->format, + static_cast(color.r), + static_cast(color.g), + static_cast(color.b)); + + switch (bpp) + { + case 1: + *p = static_cast(pixel); + break; + + case 2: + *reinterpret_cast(p) = SDLAlpha16( + static_cast(pixel), + *reinterpret_cast(p), + static_cast(color.a), surface->format); + break; + + case 3: +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + p[2] = static_cast((p[2] * (255 - color.a) + + color.b * color.a) >> 8); + p[1] = static_cast((p[1] * (255 - color.a) + + color.g * color.a) >> 8); + p[0] = static_cast((p[0] * (255 - color.a) + + color.r * color.a) >> 8); +#else + p[0] = static_cast((p[0] * (255 - color.a) + + color.b * color.a) >> 8); + p[1] = static_cast((p[1] * (255 - color.a) + + color.g * color.a) >> 8); + p[2] = static_cast((p[2] * (255 - color.a) + + color.r * color.a) >> 8); +#endif + break; + + case 4: + *reinterpret_cast(p) = SDLAlpha32(pixel, + *reinterpret_cast(p), + static_cast(color.a)); + break; + default: + break; + } + + SDL_UnlockSurface(surface); +} + +#endif // UTILS_SDLPIXEL_HPP -- cgit v1.2.3-60-g2f50