Changeset 809ce16 in opengl-game for new-game.cpp

Timestamp:

Jun 10, 2018, 10:34:19 PM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

81f28c0

Parents:

5c403fe

Message:

Add the ability to tilt the camera up or down with arrow keys. Moving the camera still moves it forward, backward, left, or right based on the cmera's current orientation. Using the right or left arrow keys will pan the cemra around the world y axis, regardless of its vertical tilt.

File:

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

new-game.cpp

@@ -475 +475 @@
    float cam_speed = 1.0f;
    float cam_yaw_speed = 60.0f*ONE_DEG_IN_RAD;
+   float cam_pitch_speed = 60.0f*ONE_DEG_IN_RAD;
 
    // glm::lookAt can create the view matrix
@@ -481 +482 @@
    cam_pos = vec3(0.0f, 0.0f, 2.0f);
    float cam_yaw = 0.0f * 2.0f * 3.14159f / 360.0f;
+   float cam_pitch = 0.0f * 2.0f * 3.14159f / 360.0f;
 
    mat4 T = translate(mat4(), vec3(-cam_pos.x, -cam_pos.y, -cam_pos.z));
@@ -636 +638 @@
       float dist = cam_speed * elapsed_seconds;
       if (glfwGetKey(window, GLFW_KEY_A)) {
-         cam_pos.x -= cos(cam_yaw)*dist;
-         cam_pos.z += sin(cam_yaw)*dist;
+         vec3 dir = (inverse(R) * vec4(-1.0f, 0.0f, 0.0f, 1.0f)).xyz();
+         cam_pos += dir * dist;
 
          cam_moved = true;
       }
       if (glfwGetKey(window, GLFW_KEY_D)) {
-         cam_pos.x += cos(cam_yaw)*dist;
-         cam_pos.z -= sin(cam_yaw)*dist;
+         vec3 dir = (inverse(R) * vec4(1.0f, 0.0f, 0.0f, 1.0f)).xyz();
+         cam_pos += dir * dist;
 
          cam_moved = true;
       }
       if (glfwGetKey(window, GLFW_KEY_W)) {
-         cam_pos.x -= sin(cam_yaw)*dist;
-         cam_pos.z -= cos(cam_yaw)*dist;
+         vec3 dir = (inverse(R) * vec4(0.0f, 0.0f, -1.0f, 1.0f)).xyz();
+         cam_pos += dir * dist;
 
          cam_moved = true;
       }
       if (glfwGetKey(window, GLFW_KEY_S)) {
-         cam_pos.x += sin(cam_yaw)*dist;
-         cam_pos.z += cos(cam_yaw)*dist;
+         vec3 dir = (inverse(R) * vec4(0.0f, 0.0f, 1.0f, 1.0f)).xyz();
+         cam_pos += dir * dist;
 
          cam_moved = true;
@@ -667 +669 @@
          cam_moved = true;
       }
+      if (glfwGetKey(window, GLFW_KEY_UP)) {
+         cam_pitch += cam_pitch_speed * elapsed_seconds;
+         cam_moved = true;
+      }
+      if (glfwGetKey(window, GLFW_KEY_DOWN)) {
+         cam_pitch -= cam_pitch_speed * elapsed_seconds;
+         cam_moved = true;
+      }
       if (cam_moved) {
          T = translate(mat4(), vec3(-cam_pos.x, -cam_pos.y, -cam_pos.z));
-         R = rotate(mat4(), -cam_yaw, vec3(0.0f, 1.0f, 0.0f));
+
+         mat4 yaw_mat = rotate(mat4(), -cam_yaw, vec3(0.0f, 1.0f, 0.0f));
+         mat4 pitch_mat = rotate(mat4(), -cam_pitch, vec3(1.0f, 0.0f, 0.0f));
+         R = pitch_mat * yaw_mat;
 
          view_mat = R*T;
+
+         printVector("cam pos", cam_pos);
 
          glUseProgram(color_sp);