diff --git a/include/SFML/Graphics/BlendMode.hpp b/include/SFML/Graphics/BlendMode.hpp index a59be813..c091b41e 100644 --- a/include/SFML/Graphics/BlendMode.hpp +++ b/include/SFML/Graphics/BlendMode.hpp @@ -48,16 +48,16 @@ struct SFML_GRAPHICS_API BlendMode //////////////////////////////////////////////////////// enum Factor { - Zero, ///< (0,0,0,0) - One, ///< (1,1,1,1) - SrcColor, ///< (src.r,src.g,src.b,src.a) - OneMinusSrcColor, ///< (1,1,1,1) - (src.r,src.g,src.b,src.a) - DstColor, ///< (dst.r,dst.g,dst.b,dst.a) - OneMinusDstColor, ///< (1,1,1,1) - (dst.r,dst.g,dst.b,dst.a) - SrcAlpha, ///< (src.a,src.a,src.a,src.a) - OneMinusSrcAlpha, ///< (1,1,1,1) - (src.a,src.a,src.a,src.a) - DstAlpha, ///< (dst.a,dst.a,dst.a,dst.a) - OneMinusDstAlpha ///< (1,1,1,1) - (dst.a,dst.a,dst.a,dst.a) + Zero, ///< (0, 0, 0, 0) + One, ///< (1, 1, 1, 1) + SrcColor, ///< (src.r, src.g, src.b, src.a) + OneMinusSrcColor, ///< (1, 1, 1, 1) - (src.r, src.g, src.b, src.a) + DstColor, ///< (dst.r, dst.g, dst.b, dst.a) + OneMinusDstColor, ///< (1, 1, 1, 1) - (dst.r, dst.g, dst.b, dst.a) + SrcAlpha, ///< (src.a, src.a, src.a, src.a) + OneMinusSrcAlpha, ///< (1, 1, 1, 1) - (src.a, src.a, src.a, src.a) + DstAlpha, ///< (dst.a, dst.a, dst.a, dst.a) + OneMinusDstAlpha ///< (1, 1, 1, 1) - (dst.a, dst.a, dst.a, dst.a) }; //////////////////////////////////////////////////////// @@ -67,8 +67,8 @@ struct SFML_GRAPHICS_API BlendMode //////////////////////////////////////////////////////// enum Equation { - Add, ///< Pixel = Src * SrcFactor + Dst * DstFactor - Subtract ///< Pixel = Src * SrcFactor - Dst * DstFactor + Add, ///< Pixel = Src * SrcFactor + Dst * DstFactor + Subtract ///< Pixel = Src * SrcFactor - Dst * DstFactor }; //////////////////////////////////////////////////////////// @@ -91,18 +91,18 @@ struct SFML_GRAPHICS_API BlendMode /// //////////////////////////////////////////////////////////// BlendMode(Factor colorSourceFactor, Factor colorDestinationFactor, - Equation colorBlendEquation, Factor alphaSourceFactor, - Factor alphaDestinationFactor, Equation alphaBlendEquation); + Equation colorBlendEquation, Factor alphaSourceFactor, + Factor alphaDestinationFactor, Equation alphaBlendEquation); //////////////////////////////////////////////////////////// // Member Data //////////////////////////////////////////////////////////// - Factor colorSrcFactor; ///< Source blending factor for the color channels - Factor colorDstFactor; ///< Destination blending factor for the color channels - Equation colorEquation; ///< Blending equation for the color channels - Factor alphaSrcFactor; ///< Source blending factor for the alpha channel - Factor alphaDstFactor; ///< Destination blending factor for the alpha channel - Equation alphaEquation; ///< Blending equation for the alpha channel + Factor colorSrcFactor; ///< Source blending factor for the color channels + Factor colorDstFactor; ///< Destination blending factor for the color channels + Equation colorEquation; ///< Blending equation for the color channels + Factor alphaSrcFactor; ///< Source blending factor for the alpha channel + Factor alphaDstFactor; ///< Destination blending factor for the alpha channel + Equation alphaEquation; ///< Blending equation for the alpha channel }; //////////////////////////////////////////////////////////// diff --git a/src/SFML/Graphics/BlendMode.cpp b/src/SFML/Graphics/BlendMode.cpp index 15b2ca5c..e7ffd490 100644 --- a/src/SFML/Graphics/BlendMode.cpp +++ b/src/SFML/Graphics/BlendMode.cpp @@ -34,13 +34,13 @@ namespace sf // Commonly used blending modes //////////////////////////////////////////////////////////// const BlendMode BlendAlpha(BlendMode::SrcAlpha, BlendMode::OneMinusSrcAlpha, BlendMode::Add, - BlendMode::One, BlendMode::OneMinusSrcAlpha, BlendMode::Add); + BlendMode::One, BlendMode::OneMinusSrcAlpha, BlendMode::Add); const BlendMode BlendAdd(BlendMode::SrcAlpha, BlendMode::One, BlendMode::Add, - BlendMode::One, BlendMode::One, BlendMode::Add); + BlendMode::One, BlendMode::One, BlendMode::Add); const BlendMode BlendMultiply(BlendMode::DstColor, BlendMode::Zero, BlendMode::Add, - BlendMode::DstColor, BlendMode::Zero, BlendMode::Add); + BlendMode::DstColor, BlendMode::Zero, BlendMode::Add); const BlendMode BlendNone(BlendMode::One, BlendMode::Zero, BlendMode::Add, - BlendMode::One, BlendMode::Zero, BlendMode::Add); + BlendMode::One, BlendMode::Zero, BlendMode::Add); //////////////////////////////////////////////////////////// @@ -58,8 +58,8 @@ alphaEquation (BlendMode::Add) //////////////////////////////////////////////////////////// BlendMode::BlendMode(Factor colorSourceFactor, Factor colorDestinationFactor, - Equation colorBlendEquation, Factor alphaSourceFactor, - Factor alphaDestinationFactor, Equation alphaBlendEquation) : + Equation colorBlendEquation, Factor alphaSourceFactor, + Factor alphaDestinationFactor, Equation alphaBlendEquation) : colorSrcFactor(colorSourceFactor), colorDstFactor(colorDestinationFactor), colorEquation (colorBlendEquation),