change all references of IDENTITY_FRONT to IDENTITY_FORWARD

Triplelexx committed 9 years ago

Commit b7980561 parent 248c93212 files · +18 −18Browse files

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

Unified · Split

interface/src/Application.cpp+2−2

@@ -2131,7 +2131,7 @@ void Application::paintGL() { · 2130 unmodified lines
2131	PerformanceTimer perfTimer("CameraUpdates");	2131	PerformanceTimer perfTimer("CameraUpdates");
2132		2132
2133	auto myAvatar = getMyAvatar();	2133	auto myAvatar = getMyAvatar();
2134	boomOffset = myAvatar->getScale() * myAvatar->getBoomLength() * -IDENTITY_FRONT;	2134	boomOffset = myAvatar->getScale() * myAvatar->getBoomLength() * -IDENTITY_FORWARD;
2135		2135
2136	if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON \|\| _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {	2136	if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON \|\| _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
2137	Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);	2137	Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
@@ -3954,7 +3954,7 @@ void Application::updateMyAvatarLookAtPosition() { · 1816 unmodified lines
3954	auto lookingAtHead = static_pointer_cast<Avatar>(lookingAt)->getHead();	3954	auto lookingAtHead = static_pointer_cast<Avatar>(lookingAt)->getHead();
3955		3955
3956	const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE;	3956	const float MAXIMUM_FACE_ANGLE = 65.0f * RADIANS_PER_DEGREE;
3957	glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FRONT;	3957	glm::vec3 lookingAtFaceOrientation = lookingAtHead->getFinalOrientationInWorldFrame() * IDENTITY_FORWARD;
3958	glm::vec3 fromLookingAtToMe = glm::normalize(myAvatar->getHead()->getEyePosition()	3958	glm::vec3 fromLookingAtToMe = glm::normalize(myAvatar->getHead()->getEyePosition()
3959	- lookingAtHead->getEyePosition());	3959	- lookingAtHead->getEyePosition());
3960	float faceAngle = glm::angle(lookingAtFaceOrientation, fromLookingAtToMe);	3960	float faceAngle = glm::angle(lookingAtFaceOrientation, fromLookingAtToMe);