lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ColorMask is char;

This commit is contained in:
bjorn 2016-10-03 11:41:31 -07:00
parent e6dcfad12d
commit 2e48c00876
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/graphics.c
View File

@ -132,15 +132,15 @@ void lovrGraphicsSetColor(unsigned char r, unsigned char g, unsigned char b, uns
state.color = LOVR_COLOR(r, g, b, a); state.color = LOVR_COLOR(r, g, b, a);
} }
void lovrGraphicsGetColorMask(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a) { void lovrGraphicsGetColorMask(char* r, char* g, char* b, char* a) {
unsigned char mask = state.colorMask; char mask = state.colorMask;
*r = mask & 0x1; *r = mask & 0x1;
*g = mask & 0x2; *g = mask & 0x2;
*b = mask & 0x4; *b = mask & 0x4;
*a = mask & 0x8; *a = mask & 0x8;
} }
void lovrGraphicsSetColorMask(unsigned char r, unsigned char g, unsigned char b, unsigned char a) { void lovrGraphicsSetColorMask(char r, char g, char b, char a) {
state.colorMask = ((r & 1) << 0) | ((g & 1) << 1) | ((b & 1) << 2) | ((a & 1) << 3); state.colorMask = ((r & 1) << 0) | ((g & 1) << 1) | ((b & 1) << 2) | ((a & 1) << 3);
glColorMask(r, g, b, a); glColorMask(r, g, b, a);
} }

6
src/graphics/graphics.h
View File

@ -34,7 +34,7 @@ typedef struct {
mat4 lastProjection; mat4 lastProjection;
unsigned int color; unsigned int color;
unsigned int lastColor; unsigned int lastColor;
unsigned char colorMask; char colorMask;
char isScissorEnabled; char isScissorEnabled;
ScissorRectangle scissor; ScissorRectangle scissor;
GLuint shapeArray; GLuint shapeArray;
@ -55,8 +55,8 @@ void lovrGraphicsGetBackgroundColor(float* r, float* g, float* b, float* a);
void lovrGraphicsSetBackgroundColor(float r, float g, float b, float a); void lovrGraphicsSetBackgroundColor(float r, float g, float b, float a);
void lovrGraphicsGetColor(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a); void lovrGraphicsGetColor(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a);
void lovrGraphicsSetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a); void lovrGraphicsSetColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
void lovrGraphicsGetColorMask(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char* a); void lovrGraphicsGetColorMask(char* r, char* g, char* b, char* a);
void lovrGraphicsSetColorMask(unsigned char r, unsigned char g, unsigned char b, unsigned char a); void lovrGraphicsSetColorMask(char r, char g, char b, char a);
char lovrGraphicsIsScissorEnabled(); char lovrGraphicsIsScissorEnabled();
void lovrGraphicsSetScissorEnabled(char isEnabled); void lovrGraphicsSetScissorEnabled(char isEnabled);
void lovrGraphicsGetScissor(int* x, int* y, int* width, int* height); void lovrGraphicsGetScissor(int* x, int* y, int* width, int* height);

10
src/lovr/graphics.c
View File

@ -129,7 +129,7 @@ int l_lovrGraphicsSetColor(lua_State* L) {
} }
int l_lovrGraphicsGetColorMask(lua_State* L) { int l_lovrGraphicsGetColorMask(lua_State* L) {
unsigned char r, g, b, a; char r, g, b, a;
lovrGraphicsGetColorMask(&r, &g, &b, &a); lovrGraphicsGetColorMask(&r, &g, &b, &a);
lua_pushboolean(L, r); lua_pushboolean(L, r);
lua_pushboolean(L, g); lua_pushboolean(L, g);
@ -144,10 +144,10 @@ int l_lovrGraphicsSetColorMask(lua_State* L) {
return 0; return 0;
} }
unsigned char r = lua_toboolean(L, 1); char r = lua_toboolean(L, 1);
unsigned char g = lua_toboolean(L, 2); char g = lua_toboolean(L, 2);
unsigned char b = lua_toboolean(L, 3); char b = lua_toboolean(L, 3);
unsigned char a = lua_toboolean(L, 4); char a = lua_toboolean(L, 4);
lovrGraphicsSetColorMask(r, g, b, a); lovrGraphicsSetColorMask(r, g, b, a);
return 0; return 0;
} }