Changeset eeece4e in opengl-game

Timestamp:

Aug 8, 2017, 1:11:28 AM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

363d5ff

Parents:

9e81839

Message:

In the pong game, allow shapes to be composed of multiple triangles and create a stationary red paddle on the left side of the screen.

File:

• pong.cpp (modified) (5 diffs)

pong.cpp

@@ -96 +96 @@
 
    GLfloat points_paddle[] = {
-       0.0f, -0.5f,  0.0f,
-       0.5f,  0.5f,  0.0f,
-      -0.5f,  0.5f,  0.0f,
+      -1.0f,  1.0f,  0.0f,
+      -1.0f,  0.7f,  0.0f,
+      -0.9f,  0.7f,  0.0f,
+      -1.0f,  1.0f,  0.0f,
+      -0.9f,  0.7f,  0.0f,
+      -0.9f,  1.0f,  0.0f,
    };
 
    GLfloat colors_paddle[] = {
       1.0, 0.0, 0.0,
-      0.0, 0.0, 1.0,
-      0.0, 1.0, 0.0,
+      1.0, 0.0, 0.0,
+      1.0, 0.0, 0.0,
+      1.0, 0.0, 0.0,
+      1.0, 0.0, 0.0,
+      1.0, 0.0, 0.0,
    };
 
@@ -111 +117 @@
      0.0f, 1.0f, 0.0f, 0.0f, // column 2
      0.0f, 0.0f, 1.0f, 0.0f, // column 3
-     0.5f, 0.0f, 0.0f, 1.0f, // column 4
+     0.0f, 0.0f, 0.0f, 1.0f, // column 4
    };
 
@@ -130 +136 @@
 
    glLinkProgram(shader_program);
+   glUseProgram(shader_program);
 
    GLint location = glGetUniformLocation(shader_program, "model");
@@ -146 +153 @@
       }
 
+      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+      model[12] = 0.0f;
+      glUniformMatrix4fv(location, 1, GL_FALSE, model);
+
+      glBindVertexArray(paddle_vao);
+      glEnableVertexAttribArray(0);
+      glEnableVertexAttribArray(1);
+
+      glDrawArrays(GL_TRIANGLES, 0, sizeof(points_paddle)/sizeof(GLfloat)/3);
+
       model[12] = last_position + speed*elapsed_seconds;
       last_position = model[12];
-      glUseProgram(shader_program);
       glUniformMatrix4fv(location, 1, GL_FALSE, model);
-
-      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
       glBindVertexArray(ball_vao);
@@ -157 +172 @@
       glEnableVertexAttribArray(1);
 
-      glDrawArrays(GL_TRIANGLES, 0, 3);
-
-      glBindVertexArray(paddle_vao);
-      glEnableVertexAttribArray(0);
-      glEnableVertexAttribArray(1);
-
-      glDrawArrays(GL_TRIANGLES, 0, 3);
+      glDrawArrays(GL_TRIANGLES, 0, sizeof(points)/sizeof(GLfloat)/3);
 
       glfwPollEvents();