mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-14 21:17:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] opengl: refactor to use project naming standards

Browse source
This commit is contained in:
Geoffrey McRae 2021-08-08 17:21:25 +10:00
parent 266ad27998
commit 2141046da9
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
client/renderers/OpenGL/opengl.c
View file

@ -162,8 +162,8 @@ struct Inst
struct IntRect mousePos; struct IntRect mousePos;
}; };
static bool _check_gl_error(unsigned int line, const char * name); static bool _checkGLError(unsigned int line, const char * name);
#define check_gl_error(name) _check_gl_error(__LINE__, name) #define check_gl_error(name) _checkGLError(__LINE__, name)
enum ConfigStatus enum ConfigStatus
{ {
@ -174,10 +174,10 @@ enum ConfigStatus
static void deconfigure(struct Inst * this); static void deconfigure(struct Inst * this);
static enum ConfigStatus configure(struct Inst * this); static enum ConfigStatus configure(struct Inst * this);
static void update_mouse_shape(struct Inst * this, bool * newShape); static void updateMouseShape(struct Inst * this, bool * newShape);
static bool draw_frame(struct Inst * this); static bool drawFrame(struct Inst * this);
static void draw_mouse(struct Inst * this); static void drawMouse(struct Inst * this);
static void render_wait(struct Inst * this); static void renderWait(struct Inst * this);
const char * opengl_getName(void) const char * opengl_getName(void)
{ {
@ -469,7 +469,7 @@ bool opengl_render(LG_Renderer * renderer, LG_RendererRotate rotate, const bool
case CONFIG_STATUS_NOOP : case CONFIG_STATUS_NOOP :
case CONFIG_STATUS_OK : case CONFIG_STATUS_OK :
if (!draw_frame(this)) if (!drawFrame(this))
return false; return false;
} }
@ -477,16 +477,16 @@ bool opengl_render(LG_Renderer * renderer, LG_RendererRotate rotate, const bool
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
if (this->waiting) if (this->waiting)
render_wait(this); renderWait(this);
else else
{ {
bool newShape; bool newShape;
update_mouse_shape(this, &newShape); updateMouseShape(this, &newShape);
glCallList(this->texList + this->texRIndex); glCallList(this->texList + this->texRIndex);
draw_mouse(this); drawMouse(this);
if (!this->waitDone) if (!this->waitDone)
render_wait(this); renderWait(this);
} }
if (app_renderOverlay(NULL, 0) != 0) if (app_renderOverlay(NULL, 0) != 0)
@ -508,7 +508,7 @@ bool opengl_render(LG_Renderer * renderer, LG_RendererRotate rotate, const bool
return true; return true;
} }
void draw_torus(float x, float y, float inner, float outer, unsigned int pts) void drawTorus(float x, float y, float inner, float outer, unsigned int pts)
{ {
glBegin(GL_QUAD_STRIP); glBegin(GL_QUAD_STRIP);
for (unsigned int i = 0; i <= pts; ++i) for (unsigned int i = 0; i <= pts; ++i)
@ -520,7 +520,7 @@ void draw_torus(float x, float y, float inner, float outer, unsigned int pts)
glEnd(); glEnd();
} }
void draw_torus_arc(float x, float y, float inner, float outer, unsigned int pts, float s, float e) void drawTorusArc(float x, float y, float inner, float outer, unsigned int pts, float s, float e)
{ {
glBegin(GL_QUAD_STRIP); glBegin(GL_QUAD_STRIP);
for (unsigned int i = 0; i <= pts; ++i) for (unsigned int i = 0; i <= pts; ++i)
@ -532,7 +532,7 @@ void draw_torus_arc(float x, float y, float inner, float outer, unsigned int pts
glEnd(); glEnd();
} }
static void render_wait(struct Inst * this) static void renderWait(struct Inst * this)
{ {
float a; float a;
if (this->waiting) if (this->waiting)
@ -572,11 +572,11 @@ static void render_wait(struct Inst * this)
glColor4f(1.0f, 1.0f, 1.0f, a); glColor4f(1.0f, 1.0f, 1.0f, a);
glScalef (2.0f, 2.0f, 1.0f); glScalef (2.0f, 2.0f, 1.0f);
draw_torus ( 0, 0, 40, 42, 60); drawTorus ( 0, 0, 40, 42, 60);
draw_torus ( 0, 0, 32, 34, 60); drawTorus ( 0, 0, 32, 34, 60);
draw_torus (-50, -3, 2, 4, 30); drawTorus (-50, -3, 2, 4, 30);
draw_torus ( 50, -3, 2, 4, 30); drawTorus ( 50, -3, 2, 4, 30);
draw_torus_arc( 0, 0, 51, 49, 60, 0.0f, M_PI); drawTorusArc( 0, 0, 51, 49, 60, 0.0f, M_PI);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glVertex2f(-1 , 50); glVertex2f(-1 , 50);
@ -593,8 +593,8 @@ static void render_wait(struct Inst * this)
glVertex2f( 21, 83); glVertex2f( 21, 83);
glEnd(); glEnd();
draw_torus_arc(-14, 83, 5, 7, 10, M_PI , M_PI / 2.0f); drawTorusArc(-14, 83, 5, 7, 10, M_PI , M_PI / 2.0f);
draw_torus_arc( 14, 83, 5, 7, 10, M_PI * 1.5f, M_PI / 2.0f); drawTorusArc( 14, 83, 5, 7, 10, M_PI * 1.5f, M_PI / 2.0f);
//FIXME: draw the diagnoal marks on the circle //FIXME: draw the diagnoal marks on the circle
@ -621,7 +621,7 @@ const LG_RendererOps LGR_OpenGL =
.render = opengl_render .render = opengl_render
}; };
static bool _check_gl_error(unsigned int line, const char * name) static bool _checkGLError(unsigned int line, const char * name)
{ {
GLenum error = glGetError(); GLenum error = glGetError();
if (error == GL_NO_ERROR) if (error == GL_NO_ERROR)
@ -884,7 +884,7 @@ static void deconfigure(struct Inst * this)
this->configured = false; this->configured = false;
} }
static void update_mouse_shape(struct Inst * this, bool * newShape) static void updateMouseShape(struct Inst * this, bool * newShape)
{ {
LG_LOCK(this->mouseLock); LG_LOCK(this->mouseLock);
*newShape = this->newShape; *newShape = this->newShape;
@ -1029,7 +1029,7 @@ static void update_mouse_shape(struct Inst * this, bool * newShape)
LG_UNLOCK(this->mouseLock); LG_UNLOCK(this->mouseLock);
} }
static bool opengl_buffer_fn(void * opaque, const void * data, size_t size) static bool opengl_bufferFn(void * opaque, const void * data, size_t size)
{ {
struct Inst * this = (struct Inst *)opaque; struct Inst * this = (struct Inst *)opaque;
@ -1046,7 +1046,7 @@ static bool opengl_buffer_fn(void * opaque, const void * data, size_t size)
return true; return true;
} }
static bool draw_frame(struct Inst * this) static bool drawFrame(struct Inst * this)
{ {
if (glIsSync(this->fences[this->texWIndex])) if (glIsSync(this->fences[this->texWIndex]))
{ {
@ -1099,7 +1099,7 @@ static bool draw_frame(struct Inst * this)
this->format.width, this->format.width,
bpp, bpp,
this->format.pitch, this->format.pitch,
opengl_buffer_fn, opengl_bufferFn,
this this
); );
@ -1154,7 +1154,7 @@ static bool draw_frame(struct Inst * this)
return true; return true;
} }
static void draw_mouse(struct Inst * this) static void drawMouse(struct Inst * this)
{ {
if (!this->mouseVisible) if (!this->mouseVisible)
return; return;