UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added BLEND_SET (#1251)

Browse source 
* added BLEND_SET

* renamed BLEND_SET to BLEND_ADD_COLORS
This commit is contained in:
Random 2020-05-16 04:39:38 -07:00 • committed by GitHub
parent abb94bd2ff
commit d9a96c4ca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/raylib.h
View file

@ -806,7 +806,8 @@ typedef enum {
typedef enum { typedef enum {
BLEND_ALPHA = 0, // Blend textures considering alpha (default) BLEND_ALPHA = 0, // Blend textures considering alpha (default)
BLEND_ADDITIVE, // Blend textures adding colors BLEND_ADDITIVE, // Blend textures adding colors
BLEND_MULTIPLIED // Blend textures multiplying colors BLEND_MULTIPLIED, // Blend textures multiplying colors
BLEND_ADD_COLORS // Blend textures adding colors (alternative)
} BlendMode; } BlendMode;
// Gestures type // Gestures type

8
src/rlgl.h
View file

@ -382,7 +382,8 @@ typedef unsigned char byte;
typedef enum { typedef enum {
BLEND_ALPHA = 0, BLEND_ALPHA = 0,
BLEND_ADDITIVE, BLEND_ADDITIVE,
BLEND_MULTIPLIED BLEND_MULTIPLIED,
BLEND_ADD_COLORS
} BlendMode; } BlendMode;
// Shader location point type // Shader location point type
@ -3558,15 +3559,16 @@ void BeginBlendMode(int mode)
{ {
static int blendMode = 0; // Track current blending mode static int blendMode = 0; // Track current blending mode
if ((blendMode != mode) && (mode < 3)) if ((blendMode != mode) && (mode < 4))
{ {
rlglDraw(); rlglDraw();
switch (mode) switch (mode)
{ {
case BLEND_ALPHA: glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); break; case BLEND_ALPHA: glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); break;
case BLEND_ADDITIVE: glBlendFunc(GL_SRC_ALPHA, GL_ONE); break; // Alternative: glBlendFunc(GL_ONE, GL_ONE); case BLEND_ADDITIVE: glBlendFunc(GL_SRC_ALPHA, GL_ONE); break;
case BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); break; case BLEND_MULTIPLIED: glBlendFunc(GL_DST_COLOR, GL_ONE_MINUS_SRC_ALPHA); break;
case BLEND_ADD_COLORS: glBlendFunc(GL_ONE, GL_ONE); break;
default: break; default: break;
} }