Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] added monochrome cursor support

Browse Source
This commit is contained in:
Geoffrey McRae 2017-12-13 04:49:43 +11:00
parent f633c63d51
commit d2957228ef
2 changed files with 85 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/lg-renderer.h
View File

@ -76,7 +76,7 @@ typedef bool (* LG_RendererInitialize )(void ** opaque, const LG_Rend
typedef void (* LG_RendererDeInitialize )(void * opaque); typedef void (* LG_RendererDeInitialize )(void * opaque);
typedef bool (* LG_RendererIsCompatible )(void * opaque, const LG_RendererFormat format); typedef bool (* LG_RendererIsCompatible )(void * opaque, const LG_RendererFormat format);
typedef void (* LG_RendererOnResize )(void * opaque, const int width, const int height, const LG_RendererRect destRect); typedef void (* LG_RendererOnResize )(void * opaque, const int width, const int height, const LG_RendererRect destRect);
typedef bool (* LG_RendererOnMouseShape )(void * opaque, const LG_RendererCursor cursor, const int width, const int height, const uint8_t * data); typedef bool (* LG_RendererOnMouseShape )(void * opaque, const LG_RendererCursor cursor, const int width, const int height, const int pitch, const uint8_t * data);
typedef bool (* LG_RendererOnMouseEvent )(void * opaque, const bool visible , const int x, const int y); typedef bool (* LG_RendererOnMouseEvent )(void * opaque, const bool visible , const int x, const int y);
typedef bool (* LG_RendererOnFrameEvent )(void * opaque, const uint8_t * data, bool resample); typedef bool (* LG_RendererOnFrameEvent )(void * opaque, const uint8_t * data, bool resample);
typedef bool (* LG_RendererRender )(void * opaque); typedef bool (* LG_RendererRender )(void * opaque);

97
client/renderers/opengl.c
View File

@ -56,6 +56,7 @@ struct LGR_OpenGL
uint64_t frameCount; uint64_t frameCount;
SDL_Rect fpsRect; SDL_Rect fpsRect;
LG_RendererCursor mouseType;
bool mouseRepair; bool mouseRepair;
SDL_Rect mouseRepairPos; SDL_Rect mouseRepairPos;
bool mouseVisible; bool mouseVisible;
@ -288,11 +289,11 @@ bool lgr_opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, co
return false; return false;
} }
this->mouseType = cursor;
switch(cursor) switch(cursor)
{ {
case LG_CURSOR_COLOR: case LG_CURSOR_COLOR:
{ {
DEBUG_INFO("%d %d", width, height);
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]); glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glPixelStorei(GL_UNPACK_ALIGNMENT , 4 ); glPixelStorei(GL_UNPACK_ALIGNMENT , 4 );
glPixelStorei(GL_UNPACK_ROW_LENGTH, width); glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
@ -308,7 +309,6 @@ bool lgr_opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, co
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
data data
); );
lgr_opengl_check_error("glTexImage2D");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@ -322,6 +322,43 @@ bool lgr_opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, co
case LG_CURSOR_MONOCHROME: case LG_CURSOR_MONOCHROME:
{ {
uint32_t d[width * height];
for(int y = 0; y < height / 2; ++y)
for(int x = 0; x < width; ++x)
{
const uint8_t * srcAnd = data + (pitch * y) + (x / 8);
const uint8_t * srcXor = srcAnd + pitch * (height / 2);
const uint8_t mask = 0x80 >> (x % 8);
const uint32_t andMask = (*srcAnd & mask) ? 0xFFFFFFFF : 0xFF000000;
const uint32_t xorMask = (*srcXor & mask) ? 0x00FFFFFF : 0x00000000;
d[y * width + x ] = andMask;
d[y * width + x + width * (height / 2)] = xorMask;
}
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glPixelStorei(GL_UNPACK_ALIGNMENT , 4 );
glPixelStorei(GL_UNPACK_ROW_LENGTH, width);
glTexImage2D
(
GL_TEXTURE_2D,
0 ,
GL_RGBA,
width ,
height ,
0 ,
GL_RGBA,
GL_UNSIGNED_BYTE,
d
);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glBindTexture(GL_TEXTURE_2D, 0);
this->mousePos.w = width;
this->mousePos.h = height / 2;
break; break;
} }
@ -523,17 +560,51 @@ void lgr_opengl_draw_mouse(struct LGR_OpenGL * this)
glPushMatrix(); glPushMatrix();
glTranslatef(this->mouseRepairPos.x, this->mouseRepairPos.y, 0.0f); glTranslatef(this->mouseRepairPos.x, this->mouseRepairPos.y, 0.0f);
glEnable(GL_BLEND); switch(this->mouseType)
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]); {
glColor4f(1.0f, 1.0f, 1.0f, 1.0f); case LG_CURSOR_COLOR:
glBegin(GL_TRIANGLE_STRIP); {
glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 ); glEnable(GL_BLEND);
glTexCoord2f(1.0f, 0.0f); glVertex2i(this->mousePos.w, 0 ); glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , this->mousePos.h); glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glTexCoord2f(1.0f, 1.0f); glVertex2i(this->mousePos.w, this->mousePos.h); glBegin(GL_TRIANGLE_STRIP);
glEnd(); glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 );
glBindTexture(GL_TEXTURE_2D, 0); glTexCoord2f(1.0f, 0.0f); glVertex2i(this->mousePos.w, 0 );
glDisable(GL_BLEND); glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , this->mousePos.h);
glTexCoord2f(1.0f, 1.0f); glVertex2i(this->mousePos.w, this->mousePos.h);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_BLEND);
break;
}
case LG_CURSOR_MONOCHROME:
{
glEnable(GL_COLOR_LOGIC_OP);
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glLogicOp(GL_AND);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.0f); glVertex2i(this->mousePos.w, 0 );
glTexCoord2f(0.0f, 0.5f); glVertex2i(0 , this->mousePos.h);
glTexCoord2f(1.0f, 0.5f); glVertex2i(this->mousePos.w, this->mousePos.h);
glEnd();
glLogicOp(GL_XOR);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.5f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.5f); glVertex2i(this->mousePos.w, 0 );
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , this->mousePos.h);
glTexCoord2f(1.0f, 1.0f); glVertex2i(this->mousePos.w, this->mousePos.h);
glEnd();
glDisable(GL_COLOR_LOGIC_OP);
glBindTexture(GL_TEXTURE_2D, 0);
break;
}
case LG_CURSOR_MASKED_COLOR:
// TODO
break;
}
glPopMatrix(); glPopMatrix();
} }