diff --git a/include/SFML/Graphics/BlendMode.h b/include/SFML/Graphics/BlendMode.h index e46f563..2f0a6c8 100644 --- a/include/SFML/Graphics/BlendMode.h +++ b/include/SFML/Graphics/BlendMode.h @@ -32,16 +32,54 @@ //////////////////////////////////////////////////////////// -/// \brief Available blending modes for drawing +/// \brief Enumeration of the blending factors /// //////////////////////////////////////////////////////////// typedef enum { - sfBlendAlpha, ///< Pixel = Src * a + Dest * (1 - a) - sfBlendAdd, ///< Pixel = Src + Dest - sfBlendMultiply, ///< Pixel = Src * Dest - sfBlendNone ///< No blending + sfBlendFactorZero, ///< (0, 0, 0, 0) + sfBlendFactorOne, ///< (1, 1, 1, 1) + sfBlendFactorSrcColor, ///< (src.r, src.g, src.b, src.a) + sfBlendFactorOneMinusSrcColor, ///< (1, 1, 1, 1) - (src.r, src.g, src.b, src.a) + sfBlendFactorDstColor, ///< (dst.r, dst.g, dst.b, dst.a) + sfBlendFactorOneMinusDstColor, ///< (1, 1, 1, 1) - (dst.r, dst.g, dst.b, dst.a) + sfBlendFactorSrcAlpha, ///< (src.a, src.a, src.a, src.a) + sfBlendFactorOneMinusSrcAlpha, ///< (1, 1, 1, 1) - (src.a, src.a, src.a, src.a) + sfBlendFactorDstAlpha, ///< (dst.a, dst.a, dst.a, dst.a) + sfBlendFactorOneMinusDstAlpha ///< (1, 1, 1, 1) - (dst.a, dst.a, dst.a, dst.a) +} sfBlendFactor; + + +//////////////////////////////////////////////////////////// +/// \brief Enumeration of the blending equations +/// +//////////////////////////////////////////////////////////// +typedef enum +{ + sfBlendEquationAdd, ///< Pixel = Src * SrcFactor + Dst * DstFactor + sfBlendEquationSubtract ///< Pixel = Src * SrcFactor - Dst * DstFactor +} sfBlendEquation; + + +//////////////////////////////////////////////////////////// +/// \brief Blending mode for drawing +/// +//////////////////////////////////////////////////////////// +typedef struct +{ + sfBlendFactor colorSrcFactor; ///< Source blending factor for the color channels + sfBlendFactor colorDstFactor; ///< Destination blending factor for the color channels + sfBlendEquation colorEquation; ///< Blending equation for the color channels + sfBlendFactor alphaSrcFactor; ///< Source blending factor for the alpha channel + sfBlendFactor alphaDstFactor; ///< Destination blending factor for the alpha channel + sfBlendEquation alphaEquation; ///< Blending equation for the alpha channel } sfBlendMode; +CSFML_GRAPHICS_API const sfBlendMode sfBlendAlpha; ///< Blend source and dest according to dest alpha +CSFML_GRAPHICS_API const sfBlendMode sfBlendAdd; ///< Add source to dest +CSFML_GRAPHICS_API const sfBlendMode sfBlendMultiply; ///< Multiply source and dest +CSFML_GRAPHICS_API const sfBlendMode sfBlendNone; ///< Overwrite dest with source + + #endif // SFML_BLENDMODE_H diff --git a/src/SFML/Graphics/BlendMode.cpp b/src/SFML/Graphics/BlendMode.cpp new file mode 100644 index 0000000..9a5c37e --- /dev/null +++ b/src/SFML/Graphics/BlendMode.cpp @@ -0,0 +1,45 @@ +//////////////////////////////////////////////////////////// +// +// SFML - Simple and Fast Multimedia Library +// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com) +// +// This software is provided 'as-is', without any express or implied warranty. +// In no event will the authors be held liable for any damages arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it freely, +// subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; +// you must not claim that you wrote the original software. +// If you use this software in a product, an acknowledgment +// in the product documentation would be appreciated but is not required. +// +// 2. Altered source versions must be plainly marked as such, +// and must not be misrepresented as being the original software. +// +// 3. This notice may not be removed or altered from any source distribution. +// +//////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////// +// Headers +//////////////////////////////////////////////////////////// +#include + + +//////////////////////////////////////////////////////////// +const sfBlendMode sfBlendAlpha = { sfBlendFactorSrcAlpha, sfBlendFactorOneMinusSrcAlpha, sfBlendEquationAdd, + sfBlendFactorOne, sfBlendFactorOneMinusSrcAlpha, sfBlendEquationAdd }; + +//////////////////////////////////////////////////////////// +const sfBlendMode sfBlendAdd = { sfBlendFactorSrcAlpha, sfBlendFactorOne, sfBlendEquationAdd, + sfBlendFactorOne, sfBlendFactorOne, sfBlendEquationAdd }; + +//////////////////////////////////////////////////////////// +const sfBlendMode sfBlendMultiply = { sfBlendFactorDstColor, sfBlendFactorZero, sfBlendEquationAdd, + sfBlendFactorDstColor, sfBlendFactorZero, sfBlendEquationAdd }; + +//////////////////////////////////////////////////////////// +const sfBlendMode sfBlendNone = { sfBlendFactorOne, sfBlendFactorZero, sfBlendEquationAdd, + sfBlendFactorOne, sfBlendFactorZero, sfBlendEquationAdd }; diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt index 57e785a..2a43f14 100644 --- a/src/SFML/Graphics/CMakeLists.txt +++ b/src/SFML/Graphics/CMakeLists.txt @@ -5,6 +5,7 @@ set(SRCROOT ${CMAKE_SOURCE_DIR}/src/SFML/Graphics) # all source files set(SRC ${INCROOT}/Export.h + ${SRCROOT}/BlendMode.cpp ${INCROOT}/BlendMode.h ${SRCROOT}/CircleShape.cpp ${SRCROOT}/CircleShapeStruct.h diff --git a/src/SFML/Graphics/ConvertRenderStates.hpp b/src/SFML/Graphics/ConvertRenderStates.hpp index c7e1649..d0c26da 100644 --- a/src/SFML/Graphics/ConvertRenderStates.hpp +++ b/src/SFML/Graphics/ConvertRenderStates.hpp @@ -44,7 +44,12 @@ inline sf::RenderStates convertRenderStates(const sfRenderStates* states) if (states) { - sfmlStates.blendMode = static_cast(states->blendMode); + sfmlStates.blendMode.colorSrcFactor = static_cast(states->blendMode.colorSrcFactor); + sfmlStates.blendMode.colorDstFactor = static_cast(states->blendMode.colorDstFactor); + sfmlStates.blendMode.colorEquation = static_cast(states->blendMode.colorEquation); + sfmlStates.blendMode.alphaSrcFactor = static_cast(states->blendMode.alphaSrcFactor); + sfmlStates.blendMode.alphaDstFactor = static_cast(states->blendMode.alphaDstFactor); + sfmlStates.blendMode.alphaEquation = static_cast(states->blendMode.alphaEquation); sfmlStates.transform = convertTransform(states->transform); sfmlStates.texture = states->texture ? states->texture->This : NULL; sfmlStates.shader = states->shader ? &states->shader->This : NULL;