kienan
/
game-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: kienan:386a4488a40be5d603c7dd0fb7b4ac87094b8630
Branches Tags
kienan:master
..
compare: kienan:c3c9ab5ede6b939ac5f51669c95643933b4d68cf
Branches Tags
kienan:master

No commits in common. "386a4488a40be5d603c7dd0fb7b4ac87094b8630" and "c3c9ab5ede6b939ac5f51669c95643933b4d68cf" have entirely different histories.
386a4488a4 ... c3c9ab5ede

2 changed files with 39 additions and 42 deletions
Show Stats Expand all files Collapse all files

4
src/client/client_imgui.cpp
View File

@ -82,8 +82,6 @@ int main(int argc, char** argv)
ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f); ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
float fov = 45.0; float fov = 45.0;
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LESS);
// Required before OpenGL Calls. // Required before OpenGL Calls.
GLuint vertex_array; GLuint vertex_array;
glGenVertexArrays(1, &vertex_array); glGenVertexArrays(1, &vertex_array);
@ -166,7 +164,7 @@ int main(int argc, char** argv)
// Clear GL buffers // Clear GL buffers
glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w); glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
// Render game geometries // Render game geometries
glfwGetWindowSize(window, &window_width, &window_height); glfwGetWindowSize(window, &window_width, &window_height);

77
src/client/renderable.hpp
View File

@ -33,7 +33,7 @@ namespace Renderable {
if (this->colour_buffer_data != 0) { if (this->colour_buffer_data != 0) {
glGenBuffers(1, &this->colour_buffer); glGenBuffers(1, &this->colour_buffer);
glBindBuffer(GL_ARRAY_BUFFER, this->colour_buffer); glBindBuffer(GL_ARRAY_BUFFER, this->colour_buffer);
glBufferData(GL_ARRAY_BUFFER, this->colour_buffer_data_size, glBufferData(GL_ARRAY_BUFFER, sizeof(this->colour_buffer_data),
this->colour_buffer_data, GL_STATIC_DRAW); this->colour_buffer_data, GL_STATIC_DRAW);
} }
} }
@ -55,8 +55,8 @@ namespace Renderable {
0, // stride 0, // stride
(void*)0 // array buffer offset (void*)0 // array buffer offset
); );
glDrawArrays(GL_TRIANGLES, 0, this->vertex_buffer_data_size / sizeof(GLfloat) / 3); // Starting from vertex 0; 3 vertices total -> 1 triangle
if (this->colour_buffer == 0) { if (this->colour_buffer == 0) {
glDrawArrays(GL_TRIANGLES, 0, this->vertex_buffer_data_size / sizeof(GLfloat) / 3); // Starting from vertex 0; 3 vertices total -> 1 triangle
glDisableVertexAttribArray(0); glDisableVertexAttribArray(0);
glUseProgram(0); glUseProgram(0);
return; return;
@ -71,7 +71,6 @@ namespace Renderable {
0, // stride 0, // stride
(void*)0 // array buffer offset (void*)0 // array buffer offset
); );
glDrawArrays(GL_TRIANGLES, 0, this->vertex_buffer_data_size / sizeof(GLfloat) / 3); // Starting from vertex 0; 3 vertices total -> 1 triangle
glDisableVertexAttribArray(0); glDisableVertexAttribArray(0);
glDisableVertexAttribArray(1); glDisableVertexAttribArray(1);
glUseProgram(0); glUseProgram(0);
@ -133,42 +132,42 @@ namespace Renderable {
1.0f,-1.0f, 1.0f 1.0f,-1.0f, 1.0f
}; };
static const GLfloat cube_color[] = { static const GLfloat cube_color[] = {
0.583f, 0.771f, 0.014f, -1.0f,-1.0f,-1.0f, // triangle 1 : begin
0.609f, 0.115f, 0.436f, -1.0f,-1.0f, 1.0f,
0.327f, 0.483f, 0.844f, -1.0f, 1.0f, 1.0f, // triangle 1 : end
0.822f, 0.569f, 0.201f, 1.0f, 1.0f,-1.0f, // triangle 2 : begin
0.435f, 0.602f, 0.223f, -1.0f,-1.0f,-1.0f,
0.310f, 0.747f, 0.185f, -1.0f, 1.0f,-1.0f, // triangle 2 : end
0.597f, 0.770f, 0.761f, 1.0f,-1.0f, 1.0f,
0.559f, 0.436f, 0.730f, -1.0f,-1.0f,-1.0f,
0.359f, 0.583f, 0.152f, 1.0f,-1.0f,-1.0f,
0.483f, 0.596f, 0.789f, 1.0f, 1.0f,-1.0f,
0.559f, 0.861f, 0.639f, 1.0f,-1.0f,-1.0f,
0.195f, 0.548f, 0.859f, -1.0f,-1.0f,-1.0f,
0.014f, 0.184f, 0.576f, -1.0f,-1.0f,-1.0f,
0.771f, 0.328f, 0.970f, -1.0f, 1.0f, 1.0f,
0.406f, 0.615f, 0.116f, -1.0f, 1.0f,-1.0f,
0.676f, 0.977f, 0.133f, 1.0f,-1.0f, 1.0f,
0.971f, 0.572f, 0.833f, -1.0f,-1.0f, 1.0f,
0.140f, 0.616f, 0.489f, -1.0f,-1.0f,-1.0f,
0.997f, 0.513f, 0.064f, -1.0f, 1.0f, 1.0f,
0.945f, 0.719f, 0.592f, -1.0f,-1.0f, 1.0f,
0.543f, 0.021f, 0.978f, 1.0f,-1.0f, 1.0f,
0.279f, 0.317f, 0.505f, 1.0f, 1.0f, 1.0f,
0.167f, 0.620f, 0.077f, 1.0f,-1.0f,-1.0f,
0.347f, 0.857f, 0.137f, 1.0f, 1.0f,-1.0f,
0.055f, 0.953f, 0.042f, 1.0f,-1.0f,-1.0f,
0.714f, 0.505f, 0.345f, 1.0f, 1.0f, 1.0f,
0.783f, 0.290f, 0.734f, 1.0f,-1.0f, 1.0f,
0.722f, 0.645f, 0.174f, 1.0f, 1.0f, 1.0f,
0.302f, 0.455f, 0.848f, 1.0f, 1.0f,-1.0f,
0.225f, 0.587f, 0.040f, -1.0f, 1.0f,-1.0f,
0.517f, 0.713f, 0.338f, 1.0f, 1.0f, 1.0f,
0.053f, 0.959f, 0.120f, -1.0f, 1.0f,-1.0f,
0.393f, 0.621f, 0.362f, -1.0f, 1.0f, 1.0f,
0.673f, 0.211f, 0.457f, 1.0f, 1.0f, 1.0f,
0.820f, 0.883f, 0.371f, -1.0f, 1.0f, 1.0f,
0.982f, 0.099f, 0.879f 1.0f,-1.0f, 1.0f
}; };
static const GLfloat triangle_data[] = { static const GLfloat triangle_data[] = {