duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OpenGL: Use a struct for defining 2D coordinates

Browse source 
Makes the code a bit more readable
This commit is contained in:
Clownacy 2019-08-01 13:11:55 +00:00
parent 67b3143ed6
commit d8aec418f9
1 changed files with 64 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/Backends/Rendering/OpenGL3.cpp
View file

@ -25,10 +25,16 @@ typedef struct Backend_Glyph
unsigned int height; unsigned int height;
} Backend_Glyph; } Backend_Glyph;
typedef struct Coordinate2D
{
GLfloat x;
GLfloat y;
} Coordinate2D;
typedef struct VertexBuffer typedef struct VertexBuffer
{ {
GLfloat vertexes[4][2]; Coordinate2D vertexes[4];
GLfloat texture_coordinates[4][2]; Coordinate2D texture_coordinates[4];
} VertexBuffer; } VertexBuffer;
static SDL_Window *window; static SDL_Window *window;
@ -281,23 +287,23 @@ void Backend_DrawScreen(void)
// Draw framebuffer to screen // Draw framebuffer to screen
glBindTexture(GL_TEXTURE_2D, framebuffer_surface.texture_id); glBindTexture(GL_TEXTURE_2D, framebuffer_surface.texture_id);
vertex_buffer.texture_coordinates[0][0] = 0.0f; vertex_buffer.texture_coordinates[0].x = 0.0f;
vertex_buffer.texture_coordinates[0][1] = 1.0f; vertex_buffer.texture_coordinates[0].y = 1.0f;
vertex_buffer.texture_coordinates[1][0] = 1.0f; vertex_buffer.texture_coordinates[1].x = 1.0f;
vertex_buffer.texture_coordinates[1][1] = 1.0f; vertex_buffer.texture_coordinates[1].y = 1.0f;
vertex_buffer.texture_coordinates[2][0] = 1.0f; vertex_buffer.texture_coordinates[2].x = 1.0f;
vertex_buffer.texture_coordinates[2][1] = 0.0f; vertex_buffer.texture_coordinates[2].y = 0.0f;
vertex_buffer.texture_coordinates[3][0] = 0.0f; vertex_buffer.texture_coordinates[3].x = 0.0f;
vertex_buffer.texture_coordinates[3][1] = 0.0f; vertex_buffer.texture_coordinates[3].y = 0.0f;
vertex_buffer.vertexes[0][0] = -1.0f; vertex_buffer.vertexes[0].x = -1.0f;
vertex_buffer.vertexes[0][1] = -1.0f; vertex_buffer.vertexes[0].y = -1.0f;
vertex_buffer.vertexes[1][0] = 1.0f; vertex_buffer.vertexes[1].x = 1.0f;
vertex_buffer.vertexes[1][1] = -1.0f; vertex_buffer.vertexes[1].y = -1.0f;
vertex_buffer.vertexes[2][0] = 1.0f; vertex_buffer.vertexes[2].x = 1.0f;
vertex_buffer.vertexes[2][1] = 1.0f; vertex_buffer.vertexes[2].y = 1.0f;
vertex_buffer.vertexes[3][0] = -1.0f; vertex_buffer.vertexes[3].x = -1.0f;
vertex_buffer.vertexes[3][1] = 1.0f; vertex_buffer.vertexes[3].y = 1.0f;
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer); glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
@ -395,23 +401,23 @@ static void BlitCommon(Backend_Surface *source_surface, const RECT *rect, Backen
const GLfloat vertex_top = (y * (2.0f / destination_surface->height)) - 1.0f; const GLfloat vertex_top = (y * (2.0f / destination_surface->height)) - 1.0f;
const GLfloat vertex_bottom = ((y + (rect->bottom - rect->top)) * (2.0f / destination_surface->height)) - 1.0f; const GLfloat vertex_bottom = ((y + (rect->bottom - rect->top)) * (2.0f / destination_surface->height)) - 1.0f;
vertex_buffer.texture_coordinates[0][0] = texture_left; vertex_buffer.texture_coordinates[0].x = texture_left;
vertex_buffer.texture_coordinates[0][1] = texture_top; vertex_buffer.texture_coordinates[0].y = texture_top;
vertex_buffer.texture_coordinates[1][0] = texture_right; vertex_buffer.texture_coordinates[1].x = texture_right;
vertex_buffer.texture_coordinates[1][1] = texture_top; vertex_buffer.texture_coordinates[1].y = texture_top;
vertex_buffer.texture_coordinates[2][0] = texture_right; vertex_buffer.texture_coordinates[2].x = texture_right;
vertex_buffer.texture_coordinates[2][1] = texture_bottom; vertex_buffer.texture_coordinates[2].y = texture_bottom;
vertex_buffer.texture_coordinates[3][0] = texture_left; vertex_buffer.texture_coordinates[3].x = texture_left;
vertex_buffer.texture_coordinates[3][1] = texture_bottom; vertex_buffer.texture_coordinates[3].y = texture_bottom;
vertex_buffer.vertexes[0][0] = vertex_left; vertex_buffer.vertexes[0].x = vertex_left;
vertex_buffer.vertexes[0][1] = vertex_top; vertex_buffer.vertexes[0].y = vertex_top;
vertex_buffer.vertexes[1][0] = vertex_right; vertex_buffer.vertexes[1].x = vertex_right;
vertex_buffer.vertexes[1][1] = vertex_top; vertex_buffer.vertexes[1].y = vertex_top;
vertex_buffer.vertexes[2][0] = vertex_right; vertex_buffer.vertexes[2].x = vertex_right;
vertex_buffer.vertexes[2][1] = vertex_bottom; vertex_buffer.vertexes[2].y = vertex_bottom;
vertex_buffer.vertexes[3][0] = vertex_left; vertex_buffer.vertexes[3].x = vertex_left;
vertex_buffer.vertexes[3][1] = vertex_bottom; vertex_buffer.vertexes[3].y = vertex_bottom;
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer); glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
@ -453,14 +459,14 @@ static void ColourFillCommon(Backend_Surface *surface, const RECT *rect, unsigne
const GLfloat vertex_top = (rect->top * (2.0f / surface->height)) - 1.0f; const GLfloat vertex_top = (rect->top * (2.0f / surface->height)) - 1.0f;
const GLfloat vertex_bottom = (rect->bottom * (2.0f / surface->height)) - 1.0f; const GLfloat vertex_bottom = (rect->bottom * (2.0f / surface->height)) - 1.0f;
vertex_buffer.vertexes[0][0] = vertex_left; vertex_buffer.vertexes[0].x = vertex_left;
vertex_buffer.vertexes[0][1] = vertex_top; vertex_buffer.vertexes[0].y = vertex_top;
vertex_buffer.vertexes[1][0] = vertex_right; vertex_buffer.vertexes[1].x = vertex_right;
vertex_buffer.vertexes[1][1] = vertex_top; vertex_buffer.vertexes[1].y = vertex_top;
vertex_buffer.vertexes[2][0] = vertex_right; vertex_buffer.vertexes[2].x = vertex_right;
vertex_buffer.vertexes[2][1] = vertex_bottom; vertex_buffer.vertexes[2].y = vertex_bottom;
vertex_buffer.vertexes[3][0] = vertex_left; vertex_buffer.vertexes[3].x = vertex_left;
vertex_buffer.vertexes[3][1] = vertex_bottom; vertex_buffer.vertexes[3].y = vertex_bottom;
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer.vertexes), &vertex_buffer); glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer.vertexes), &vertex_buffer);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
@ -587,23 +593,23 @@ static void DrawGlyphCommon(Backend_Surface *surface, Backend_Glyph *glyph, long
glUniform4f(program_glyph_uniform_colour, colours[0] / 255.0f, colours[1] / 255.0f, colours[2] / 255.0f, 1.0f); glUniform4f(program_glyph_uniform_colour, colours[0] / 255.0f, colours[1] / 255.0f, colours[2] / 255.0f, 1.0f);
vertex_buffer.texture_coordinates[0][0] = 0.0f; vertex_buffer.texture_coordinates[0].x = 0.0f;
vertex_buffer.texture_coordinates[0][1] = 0.0f; vertex_buffer.texture_coordinates[0].y = 0.0f;
vertex_buffer.texture_coordinates[1][0] = 1.0f; vertex_buffer.texture_coordinates[1].x = 1.0f;
vertex_buffer.texture_coordinates[1][1] = 0.0f; vertex_buffer.texture_coordinates[1].y = 0.0f;
vertex_buffer.texture_coordinates[2][0] = 1.0f; vertex_buffer.texture_coordinates[2].x = 1.0f;
vertex_buffer.texture_coordinates[2][1] = 1.0f; vertex_buffer.texture_coordinates[2].y = 1.0f;
vertex_buffer.texture_coordinates[3][0] = 0.0f; vertex_buffer.texture_coordinates[3].x = 0.0f;
vertex_buffer.texture_coordinates[3][1] = 1.0f; vertex_buffer.texture_coordinates[3].y = 1.0f;
vertex_buffer.vertexes[0][0] = vertex_left; vertex_buffer.vertexes[0].x = vertex_left;
vertex_buffer.vertexes[0][1] = vertex_top; vertex_buffer.vertexes[0].y = vertex_top;
vertex_buffer.vertexes[1][0] = vertex_right; vertex_buffer.vertexes[1].x = vertex_right;
vertex_buffer.vertexes[1][1] = vertex_top; vertex_buffer.vertexes[1].y = vertex_top;
vertex_buffer.vertexes[2][0] = vertex_right; vertex_buffer.vertexes[2].x = vertex_right;
vertex_buffer.vertexes[2][1] = vertex_bottom; vertex_buffer.vertexes[2].y = vertex_bottom;
vertex_buffer.vertexes[3][0] = vertex_left; vertex_buffer.vertexes[3].x = vertex_left;
vertex_buffer.vertexes[3][1] = vertex_bottom; vertex_buffer.vertexes[3].y = vertex_bottom;
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer); glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertex_buffer), &vertex_buffer);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4); glDrawArrays(GL_TRIANGLE_FAN, 0, 4);