Merge pull request #7112 from howard-stearns/snap-turn-preference

Snap turn preference

Brad Hefta-Gaub committed 10 years ago

Commit 38430d82 parents d5c349a 6d705849 files · +17 −10Browse files

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

Unified · Split

interface/src/Application.cpp+2−2

@@ -849,8 +849,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 848 unmodified lines
849	849	_applicationStateDevice->addInputVariant(QString("InHMD"), controller::StateController::ReadLambda([]() -> float {
850	850	return (float)qApp->getAvatarUpdater()->isHMDMode();
851	851	}));
852		− _applicationStateDevice->addInputVariant(QString("ComfortMode"), controller::StateController::ReadLambda([]() -> float {
853		− return (float)Menu::getInstance()->isOptionChecked(MenuOption::ComfortMode);
	852	+ _applicationStateDevice->addInputVariant(QString("SnapTurn"), controller::StateController::ReadLambda([]() -> float {
	853	+ return (float)qApp->getMyAvatar()->getSnapTurn();
854	854	}));
855	855	_applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float {
856	856	return (float)qApp->getMyAvatar()->getCharacterController()->onGround();