History

Merge with master

Sam Gondelman committed 11 years ago

Commit 19ec0802 parents 778e19a 0bef506214 files · +6701 −6001Browse files

Showing the changes to interface/src/Camera.cpp (1 of 214 files). Show all

Unified · Split

interface/src/Camera.cpp+0−16
@@ -49,8 +49,6 @@ Camera::Camera() : · 48 unmodified lines
4949 _mode(CAMERA_MODE_THIRD_PERSON),
5050 _position(0.0f, 0.0f, 0.0f),
5151 _projection(glm::perspective(glm::radians(DEFAULT_FIELD_OF_VIEW_DEGREES), 16.0f/9.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)),
52− _hmdPosition(),
53− _hmdRotation(),
5452 _isKeepLookingAt(false),
5553 _lookingAt(0.0f, 0.0f, 0.0f)
5654 {
@@ -74,20 +72,6 @@ void Camera::setRotation(const glm::quat& rotation) { · 17 unmodified lines
7472 }
7573 }
7674
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−
9175 void Camera::setMode(CameraMode mode) {
9276 _mode = mode;
9377 emit modeUpdated(modeToString(mode));