Showing the changes to interface/src/Camera.cpp (1 of 214 files). Show all
Unified · Split
| @@ -49,8 +49,6 @@ Camera::Camera() : · 48 unmodified lines | |||
| 49 | _mode(CAMERA_MODE_THIRD_PERSON), | 49 | _mode(CAMERA_MODE_THIRD_PERSON), |
| 50 | _position(0.0f, 0.0f, 0.0f), | 50 | _position(0.0f, 0.0f, 0.0f), |
| 51 | _projection(glm::perspective(glm::radians(DEFAULT_FIELD_OF_VIEW_DEGREES), 16.0f/9.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)), | 51 | _projection(glm::perspective(glm::radians(DEFAULT_FIELD_OF_VIEW_DEGREES), 16.0f/9.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)), |
| 52 | _hmdPosition(), | ||
| 53 | _hmdRotation(), | ||
| 54 | _isKeepLookingAt(false), | 52 | _isKeepLookingAt(false), |
| 55 | _lookingAt(0.0f, 0.0f, 0.0f) | 53 | _lookingAt(0.0f, 0.0f, 0.0f) |
| 56 | { | 54 | { |
| @@ -74,20 +72,6 @@ void Camera::setRotation(const glm::quat& rotation) { · 17 unmodified lines | |||
| 74 | } | 72 | } |
| 75 | } | 73 | } |
| 76 | 74 | ||
| 77 | void Camera::setHmdPosition(const glm::vec3& hmdPosition) { | ||
| 78 | _hmdPosition = hmdPosition; | ||
| 79 | if (_isKeepLookingAt) { | ||
| 80 | lookAt(_lookingAt); | ||
| 81 | } | ||
| 82 | } | ||
| 83 | |||
| 84 | void Camera::setHmdRotation(const glm::quat& hmdRotation) { | ||
| 85 | _hmdRotation = hmdRotation; | ||
| 86 | if (_isKeepLookingAt) { | ||
| 87 | lookAt(_lookingAt); | ||
| 88 | } | ||
| 89 | } | ||
| 90 | |||
| 91 | void Camera::setMode(CameraMode mode) { | 75 | void Camera::setMode(CameraMode mode) { |
| 92 | _mode = mode; | 76 | _mode = mode; |
| 93 | emit modeUpdated(modeToString(mode)); | 77 | emit modeUpdated(modeToString(mode)); |