diff --git a/src/camera.cpp b/src/camera.cpp index 05091b7..132d25c 100644 --- a/src/camera.cpp +++ b/src/camera.cpp @@ -1,8 +1,6 @@ #include #include -#include #include "camera.hpp" -#include "utils.hpp" using namespace fmri; using namespace std; @@ -24,14 +22,15 @@ static void move(unsigned char key) { float speed = 0.2; float dir[3]; + // Currently very buggy if (key == 'w' || key == 's') { - dir[0] = -sin(deg2rad(yaw)) * cos(deg2rad(pitch)); - dir[1] = -sin(deg2rad(pitch)); - dir[2] = -cos(deg2rad(yaw)) * cos(deg2rad(pitch)); - } else { - dir[0] = -cos(deg2rad(yaw)); + dir[0] = 0; dir[1] = 0; - dir[2] = sin(deg2rad(yaw)); + dir[2] = -1; + } else { + dir[0] = -1; + dir[1] = 0; + dir[2] = 0; } if (key == 's' || key == 'd') { @@ -39,7 +38,6 @@ static void move(unsigned char key) } for (unsigned int i = 0; i < 3; ++i) { - cout << i << " " << dir[i] << " " << deg2rad(pitch) << " " << deg2rad(yaw) << endl; pos[i] += speed * dir[i]; } } diff --git a/src/main.cpp b/src/main.cpp index 5752bd1..766e650 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,16 +50,12 @@ static void render() configureCamera(); - glRotatef(rendererData.angle, 0.0f, 1.0f, 0.0f); - glBegin(GL_TRIANGLES); glVertex3f(-2.0f, -2.0f, 0.0f); glVertex3f(2.0f, 0.0f, 0.0); glVertex3f(0.0f, 2.0f, 0.0); glEnd(); - rendererData.angle += 0.1f; - glutSwapBuffers(); }