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

[client] use lists to draw the cursor

Browse Source
This commit is contained in:
Geoffrey McRae 2017-12-13 13:10:32 +11:00
parent 85c83d2417
commit d0e5bd02bd
1 changed files with 91 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
client/renderers/opengl.c
View File

@ -44,6 +44,7 @@ struct LGR_OpenGL
int texIndex; int texIndex;
int texList; int texList;
int fpsList; int fpsList;
int mouseList;
LG_RendererRect destRect; LG_RendererRect destRect;
bool hasTextures; bool hasTextures;
@ -63,8 +64,6 @@ struct LGR_OpenGL
SDL_Rect mousePos; SDL_Rect mousePos;
}; };
void lgr_opengl_on_resize(void * opaque, const int width, const int height, const LG_RendererRect destRect);
bool lgr_opengl_check_error(const char * name) bool lgr_opengl_check_error(const char * name)
{ {
GLenum error = glGetError(); GLenum error = glGetError();
@ -159,6 +158,7 @@ bool lgr_opengl_initialize(void ** opaque, const LG_RendererParams params, const
// generate lists for drawing // generate lists for drawing
this->texList = glGenLists(2); this->texList = glGenLists(2);
this->fpsList = glGenLists(1); this->fpsList = glGenLists(1);
this->mouseList = glGenLists(1);
// generate the pixel unpack buffers // generate the pixel unpack buffers
glGenBuffers(VBO_BUFFERS, this->vboID); glGenBuffers(VBO_BUFFERS, this->vboID);
@ -215,6 +215,18 @@ bool lgr_opengl_initialize(void ** opaque, const LG_RendererParams params, const
(void*)0 (void*)0
); );
// create the display lists
glNewList(this->texList + i, GL_COMPILE);
glBindTexture(GL_TEXTURE_2D, this->textures[i]);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.0f); glVertex2i(format.width, 0 );
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , format.height);
glTexCoord2f(1.0f, 1.0f); glVertex2i(format.width, format.height);
glEnd();
glEndList();
if (lgr_opengl_check_error("glTexImage2D")) if (lgr_opengl_check_error("glTexImage2D"))
return false; return false;
} }
@ -317,23 +329,38 @@ bool lgr_opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, co
this->mousePos.w = width; this->mousePos.w = width;
this->mousePos.h = height; this->mousePos.h = height;
glNewList(this->mouseList, GL_COMPILE);
glEnable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.0f); glVertex2i(width, 0 );
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , height);
glTexCoord2f(1.0f, 1.0f); glVertex2i(width, height);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_BLEND);
glEndList();
break; break;
} }
case LG_CURSOR_MONOCHROME: case LG_CURSOR_MONOCHROME:
{ {
const int hheight = height / 2;
uint32_t d[width * height]; uint32_t d[width * height];
for(int y = 0; y < height / 2; ++y) for(int y = 0; y < hheight; ++y)
for(int x = 0; x < width; ++x) for(int x = 0; x < width; ++x)
{ {
const uint8_t * srcAnd = data + (pitch * y) + (x / 8); const uint8_t * srcAnd = data + (pitch * y) + (x / 8);
const uint8_t * srcXor = srcAnd + pitch * (height / 2); const uint8_t * srcXor = srcAnd + pitch * hheight;
const uint8_t mask = 0x80 >> (x % 8); const uint8_t mask = 0x80 >> (x % 8);
const uint32_t andMask = (*srcAnd & mask) ? 0xFFFFFFFF : 0xFF000000; const uint32_t andMask = (*srcAnd & mask) ? 0xFFFFFFFF : 0xFF000000;
const uint32_t xorMask = (*srcXor & mask) ? 0x00FFFFFF : 0x00000000; const uint32_t xorMask = (*srcXor & mask) ? 0x00FFFFFF : 0x00000000;
d[y * width + x ] = andMask; d[y * width + x ] = andMask;
d[y * width + x + width * (height / 2)] = xorMask; d[y * width + x + width * hheight] = xorMask;
} }
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]); glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
@ -358,12 +385,33 @@ bool lgr_opengl_on_mouse_shape(void * opaque, const LG_RendererCursor cursor, co
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
this->mousePos.w = width; this->mousePos.w = width;
this->mousePos.h = height / 2; this->mousePos.h = hheight;
glNewList(this->mouseList, GL_COMPILE);
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(width, 0 );
glTexCoord2f(0.0f, 0.5f); glVertex2i(0 , hheight);
glTexCoord2f(1.0f, 0.5f); glVertex2i(width, hheight);
glEnd();
glLogicOp(GL_XOR);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.5f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.5f); glVertex2i(width, 0 );
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , hheight);
glTexCoord2f(1.0f, 1.0f); glVertex2i(width, hheight);
glEnd();
glDisable(GL_COLOR_LOGIC_OP);
glEndList();
break; break;
} }
case LG_CURSOR_MASKED_COLOR: case LG_CURSOR_MASKED_COLOR:
{ {
//TODO
break; break;
} }
} }
@ -525,30 +573,8 @@ void lgr_opengl_draw_mouse(struct LGR_OpenGL * this)
{ {
if (this->mouseRepair) if (this->mouseRepair)
{ {
glMatrixMode(GL_TEXTURE); glCallList(this->texList + this->texIndex);
glPushMatrix();
glScalef(1.0f / (float)this->format.width, 1.0f / (float)this->format.height, 1.0f);
glTranslatef(this->mouseRepairPos.x, this->mouseRepairPos.y, 0.0f);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glTranslatef(this->mouseRepairPos.x, this->mouseRepairPos.y, 0.0f);
// repair the damage from the cursor's last position
glBindTexture(GL_TEXTURE_2D, this->textures[this->texIndex]);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0 , 0 ); glVertex2i(0 , 0 );
glTexCoord2f(this->mouseRepairPos.w, 0 ); glVertex2i(this->mouseRepairPos.w, 0 );
glTexCoord2f(0 , this->mouseRepairPos.h); glVertex2i(0 , this->mouseRepairPos.h);
glTexCoord2f(this->mouseRepairPos.w, this->mouseRepairPos.h); glVertex2i(this->mouseRepairPos.w, this->mouseRepairPos.h);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
this->mouseRepair = false; this->mouseRepair = false;
glMatrixMode(GL_TEXTURE);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
} }
if (!this->mouseVisible) if (!this->mouseVisible)
@ -559,53 +585,7 @@ 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);
glCallList(this->mouseList);
switch(this->mouseType)
{
case LG_CURSOR_COLOR:
{
glEnable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, this->textures[MOUSE_TEXTURE]);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
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, 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();
} }
@ -621,8 +601,6 @@ bool lgr_opengl_render(void * opaque)
return false; return false;
} }
if (this->frameUpdate)
{
if (this->resizeWindow) if (this->resizeWindow)
{ {
// setup the projection matrix // setup the projection matrix
@ -640,21 +618,6 @@ bool lgr_opengl_render(void * opaque)
1.0f 1.0f
); );
// update the display lists
for(int i = 0; i < VBO_BUFFERS; ++i)
{
glNewList(this->texList + i, GL_COMPILE);
glBindTexture(GL_TEXTURE_2D, this->textures[i]);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0.0f, 0.0f); glVertex2i(0 , 0 );
glTexCoord2f(1.0f, 0.0f); glVertex2i(this->format.width, 0 );
glTexCoord2f(0.0f, 1.0f); glVertex2i(0 , this->format.height);
glTexCoord2f(1.0f, 1.0f); glVertex2i(this->format.width, this->format.height);
glEnd();
glEndList();
}
// update the scissor rect to prevent drawing outside of the frame // update the scissor rect to prevent drawing outside of the frame
glScissor( glScissor(
this->destRect.x, this->destRect.x,
@ -669,6 +632,8 @@ bool lgr_opengl_render(void * opaque)
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
} }
if (this->frameUpdate)
{
glCallList(this->texList + this->texIndex); glCallList(this->texList + this->texIndex);
this->mouseRepair = false; this->mouseRepair = false;
lgr_opengl_draw_mouse(this); lgr_opengl_draw_mouse(this);