Uni/CGI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Impl 1.2.4

Browse source
This commit is contained in:
hodasemi 2018-10-17 13:00:47 +02:00
parent 213e4207dc
commit db5d8220fc
4 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1 @@
{}

5
exercise1/glsl/shader.vert
View file

@ -6,11 +6,14 @@
in vec4 in_position; in vec4 in_position;
in vec4 in_color; in vec4 in_color;
uniform mat4 view;
uniform mat4 proj;
out vec4 fragment_color; out vec4 fragment_color;
void main() void main()
{ {
gl_Position = in_position; gl_Position = proj * view * in_position;
fragment_color = in_color; fragment_color = in_color;

3
exercise1/include/Viewer.h
View file

@ -35,6 +35,9 @@ private:
color_buffer_id, // ID of the color buffer color_buffer_id, // ID of the color buffer
uv_map_buffer_id; // ID of the uv_map uv_map_buffer_id; // ID of the uv_map
GLint view_uniform_id;
GLint proj_uniform_id;
// Read, Compile and link the shader codes to a shader program // Read, Compile and link the shader codes to a shader program
void CreateShaders(); void CreateShaders();
// Create and define the vertex array and add a number of vertex buffers // Create and define the vertex array and add a number of vertex buffers

53
exercise1/src/Viewer.cpp
View file

@ -23,6 +23,9 @@ Viewer::Viewer()
CreateShaders(); CreateShaders();
CreateVertexBuffers(); CreateVertexBuffers();
view_uniform_id = glGetUniformLocation(program_id, "view");
proj_uniform_id = glGetUniformLocation(program_id, "proj");
modelViewMatrix.setIdentity(); modelViewMatrix.setIdentity();
projectionMatrix.setIdentity(); projectionMatrix.setIdentity();
@ -56,25 +59,40 @@ void Viewer::CreateVertexBuffers()
// Define 3 vertices for one face // Define 3 vertices for one face
GLfloat positions[] = { GLfloat positions[] = {
0, 1, 0, 1, -1, 1, -1, 1,
-1, -1, 0, 1, 1, -1, -1, 1,
1, -1, 0, 1}; 1, 1, 1, 1,
-1, 1, -1, 1,
-1, -1, 1, 1,
1, -1, -1, 1,
-1, 1, -1, 1,
-1, -1, 1, 1,
1, 1, 1, 1,
1, -1, -1, 1,
1, 1, 1, 1,
-1, -1, 1, 1,
};
GLfloat colors[] = { GLfloat colors[] = {
1, 1, 0, 0, 1,
0, 0, 1, 0, 1,
0, 0, 0, 1, 1,
1,
0, 1, 0, 0, 1,
1, 0, 1, 0, 1,
0, 0, 0, 1, 1,
1,
0, 1, 0, 0, 1,
0, 0, 1, 0, 1,
1, 0, 0, 1, 1,
1,
1, 0, 0, 1,
0, 1, 0, 1,
0, 0, 1, 1,
}; };
// Generate the vertex array // Generate the vertex array
@ -234,10 +252,13 @@ void Viewer::drawContents()
then set them with the command glUniformMatrix4fv. then set them with the command glUniformMatrix4fv.
*/ */
glUniformMatrix4fv(view_uniform_id, 1, false, modelViewMatrix.data());
glUniformMatrix4fv(proj_uniform_id, 1, false, projectionMatrix.data());
// Bind the vertex array // Bind the vertex array
glBindVertexArray(vertex_array_id); glBindVertexArray(vertex_array_id);
// Draw the bound vertex array. Start at element 0 and draw 3 vertices // Draw the bound vertex array. Start at element 0 and draw 3 vertices
glDrawArrays(GL_TRIANGLES, 0, 3); glDrawArrays(GL_TRIANGLES, 0, 12);
/*** End of task 1.2.4 (b) ***/ /*** End of task 1.2.4 (b) ***/