added zooming to default joystick controls

Sam Gondelman committed 11 years ago

Commit b4e108c1 parent 72cc0703 files · +37 −15Browse files

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

Unified · Split

interface/src/Application.cpp+1−2

@@ -881,8 +881,7 @@ void Application::paintGL() { · 880 unmodified lines
881		881
882	glEnable(GL_LINE_SMOOTH);	882	glEnable(GL_LINE_SMOOTH);
883		883
884	const float CAMERA_PERSON_THRESHOLD = MyAvatar::ZOOM_MIN * _myAvatar->getScale();	884	Menu::getInstance()->setIsOptionChecked("First Person", _myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
885	Menu::getInstance()->setIsOptionChecked("First Person", _myAvatar->getBoomLength() * _myAvatar->getScale() <= CAMERA_PERSON_THRESHOLD);
886	Application::getInstance()->cameraMenuChanged();	885	Application::getInstance()->cameraMenuChanged();
887		886
888	if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {	887	if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {