Showing the changes to interface/src/main.cpp (1 of 9 files). Show all
Unified · Split
| @@ -193,8 +193,6 @@ unsigned int texture_height = 256; · 192 unmodified lines | |||
| 193 | float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles | 193 | float particle_attenuation_quadratic[] = { 0.0f, 0.0f, 2.0f }; // larger Z = smaller particles |
| 194 | float pointer_attenuation_quadratic[] = { 1.0f, 0.0f, 0.0f }; // for 2D view | 194 | float pointer_attenuation_quadratic[] = { 1.0f, 0.0f, 0.0f }; // for 2D view |
| 195 | 195 | ||
| 196 | |||
| 197 | |||
| 198 | #ifdef MARKER_CAPTURE | 196 | #ifdef MARKER_CAPTURE |
| 199 | 197 | ||
| 200 | /*** Marker Capture ***/ | 198 | /*** Marker Capture ***/ |
| @@ -690,17 +688,20 @@ const float KEYBOARD_FLY_RATE = 0.08; · 489 unmodified lines | |||
| 690 | 688 | ||
| 691 | void specialkey(int k, int x, int y) | 689 | void specialkey(int k, int x, int y) |
| 692 | { | 690 | { |
| 693 | if (k == GLUT_KEY_UP) fwd_vel += KEYBOARD_FLY_RATE; | 691 | if (k == GLUT_KEY_UP || k == GLUT_KEY_DOWN || k == GLUT_KEY_LEFT || k == GLUT_KEY_RIGHT) { |
| 694 | if (k == GLUT_KEY_DOWN) fwd_vel -= KEYBOARD_FLY_RATE; | 692 | if (k == GLUT_KEY_UP) fwd_vel += KEYBOARD_FLY_RATE; |
| 695 | if (k == GLUT_KEY_LEFT) { | 693 | if (k == GLUT_KEY_DOWN) fwd_vel -= KEYBOARD_FLY_RATE; |
| 696 | if (glutGetModifiers() == GLUT_ACTIVE_SHIFT) lateral_vel -= KEYBOARD_STRAFE_RATE; | 694 | if (k == GLUT_KEY_LEFT) { |
| 695 | if (glutGetModifiers() == GLUT_ACTIVE_SHIFT) lateral_vel -= KEYBOARD_STRAFE_RATE; | ||
| 697 | else render_yaw_rate -= KEYBOARD_YAW_RATE; | 696 | else render_yaw_rate -= KEYBOARD_YAW_RATE; |
| 698 | } | 697 | } |
| 699 | if (k == GLUT_KEY_RIGHT) { | 698 | if (k == GLUT_KEY_RIGHT) { |
| 700 | if (glutGetModifiers() == GLUT_ACTIVE_SHIFT) lateral_vel += KEYBOARD_STRAFE_RATE; | 699 | if (glutGetModifiers() == GLUT_ACTIVE_SHIFT) lateral_vel += KEYBOARD_STRAFE_RATE; |
| 701 | else render_yaw_rate += KEYBOARD_YAW_RATE; | 700 | else render_yaw_rate += KEYBOARD_YAW_RATE; |
| 702 | } | 701 | } |
| 703 | 702 | ||
| 703 | audio.setWalkingState(true); | ||
| 704 | } | ||
| 704 | } | 705 | } |
| 705 | void key(unsigned char k, int x, int y) | 706 | void key(unsigned char k, int x, int y) |
| 706 | { | 707 | { |