lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omitted "Blend" prefix for nested BlendMode enums

Browse source 
BlendMode::Factor instead of BlendMode::BlendFactor
BlendMode::Equation instead of BlendMode::BlendEquation
This commit is contained in:
Jan Haller 2014-03-12 12:22:47 +01:00
parent 05d196d86d
commit 75784dbb9a
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/SFML/Graphics/BlendMode.cpp
View file

@ -57,9 +57,9 @@ alphaEquation (BlendMode::Add)
////////////////////////////////////////////////////////////
BlendMode::BlendMode(BlendFactor colorSourceFactor, BlendFactor colorDestinationFactor,
BlendEquation colorBlendEquation, BlendFactor alphaSourceFactor,
BlendFactor alphaDestinationFactor, BlendEquation alphaBlendEquation) :
BlendMode::BlendMode(Factor colorSourceFactor, Factor colorDestinationFactor,
Equation colorBlendEquation, Factor alphaSourceFactor,
Factor alphaDestinationFactor, Equation alphaBlendEquation) :
colorSrcFactor(colorSourceFactor),
colorDstFactor(colorDestinationFactor),
colorEquation (colorBlendEquation),

6
src/SFML/Graphics/RenderTarget.cpp
View file

@ -37,8 +37,8 @@
namespace
{
// Convert an sf::BlendMode::BlendFactor constant to the corresponding OpenGL constant.
sf::Uint32 factorToGlConstant(sf::BlendMode::BlendFactor blendFactor)
// Convert an sf::BlendMode::Factor constant to the corresponding OpenGL constant.
sf::Uint32 factorToGlConstant(sf::BlendMode::Factor blendFactor)
{
switch (blendFactor)
{
@ -58,7 +58,7 @@ namespace
// Convert an sf::BlendMode::BlendEquation constant to the corresponding OpenGL constant.
sf::Uint32 equationToGlConstant(sf::BlendMode::BlendEquation blendEquation)
sf::Uint32 equationToGlConstant(sf::BlendMode::Equation blendEquation)
{
switch (blendEquation)
{