Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster

samcake committed 10 years ago

Commit d8a71db2 parents aac59ad 40272fa40 files · +584 −408Browse files

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

Unified · Split

interface/src/Application.cpp+2−3

@@ -1260,15 +1260,14 @@ void Application::paintGL() { · 1259 unmodified lines
1260	hmdOffset.x = -hmdOffset.x;	1260	hmdOffset.x = -hmdOffset.x;
1261		1261
1262	_myCamera.setPosition(myAvatar->getDefaultEyePosition()	1262	_myCamera.setPosition(myAvatar->getDefaultEyePosition()
1263	+ glm::vec3(0, _raiseMirror * myAvatar->getAvatarScale(), 0)	1263	+ glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
1264	+ mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror	1264	+ mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
1265	+ mirrorBodyOrientation * hmdOffset);	1265	+ mirrorBodyOrientation * hmdOffset);
1266
1267	} else {	1266	} else {
1268	_myCamera.setRotation(myAvatar->getWorldAlignedOrientation()	1267	_myCamera.setRotation(myAvatar->getWorldAlignedOrientation()
1269	* glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));	1268	* glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
1270	_myCamera.setPosition(myAvatar->getDefaultEyePosition()	1269	_myCamera.setPosition(myAvatar->getDefaultEyePosition()
1271	+ glm::vec3(0, _raiseMirror * myAvatar->getAvatarScale(), 0)	1270	+ glm::vec3(0, _raiseMirror * myAvatar->getUniformScale(), 0)
1272	+ (myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *	1271	+ (myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
1273	glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);	1272	glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
1274	}	1273	}