Changeset 201e2f8 in opengl-game

Timestamp:

Aug 18, 2017, 1:53:46 AM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

8e232ce

Parents:

7ee66ea

Message:

Make the model matrix support rotations and translations

File:

• new-game.cpp (modified) (4 diffs)

new-game.cpp

@@ -110 +110 @@
    };
 
-   GLfloat model_mat[] = {
-     1.0f, 0.0f, 0.0f, 0.0f, // column 1
-     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
-   };
+   mat4 T_model = translate(mat4(), vec3(0.5f, 0.0f, 0.0f));
+   mat4 R_model = rotate(mat4(), 4.0f, vec3(0.0f, 1.0f, 0.0f));
+   mat4 model_mat = T_model*R_model;
 
    GLuint points_vbo = 0;
@@ -151 +148 @@
 
    float cam_speed = 1.0f;
-   float cam_yaw_speed = 30.0f*ONE_DEG_IN_RAD;
+   float cam_yaw_speed = 60.0f*ONE_DEG_IN_RAD;
 
    float cam_pos[] = {0.0f, 0.0f, 2.0f};
@@ -183 +180 @@
 
    glUseProgram(shader_program);
-   glUniformMatrix4fv(model_mat_loc, 1, GL_FALSE, model_mat);
+   glUniformMatrix4fv(model_mat_loc, 1, GL_FALSE, value_ptr(model_mat));
    glUniformMatrix4fv(view_mat_loc, 1, GL_FALSE, value_ptr(view_mat));
    glUniformMatrix4fv(proj_mat_loc, 1, GL_FALSE, proj_mat);
@@ -220 +217 @@
       float dist = cam_speed * elapsed_seconds;
       if (glfwGetKey(window, GLFW_KEY_A)) {
-         cam_pos[0] -= cos(cam_yaw*ONE_DEG_IN_RAD)*dist;
-         cam_pos[2] += sin(cam_yaw*ONE_DEG_IN_RAD)*dist;
+         cam_pos[0] -= cos(cam_yaw)*dist;
+         cam_pos[2] += sin(cam_yaw)*dist;
          cam_moved = true;
       }