Showing the changes to interface/src/Menu.cpp (1 of 63 files). Show all
Unified · Split
| @@ -188,9 +188,9 @@ Menu::Menu() : · 187 unmodified lines | |||
| 188 | QAction::PreferencesRole); | 188 | QAction::PreferencesRole); |
| 189 | 189 | ||
| 190 | addDisabledActionAndSeparator(editMenu, "Physics"); | 190 | addDisabledActionAndSeparator(editMenu, "Physics"); |
| 191 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::Gravity, Qt::SHIFT | Qt::Key_G, false); | 191 | QObject* avatar = appInstance->getAvatar(); |
| 192 | 192 | addCheckableActionToQMenuAndActionHash(editMenu, MenuOption::ObeyGravity, Qt::SHIFT | Qt::Key_G, true, | |
| 193 | 193 | avatar, SLOT(updateMotionBehaviorFlags())); | |
| 194 | 194 | ||
| 195 | 195 | ||
| 196 | addAvatarCollisionSubMenu(editMenu); | 196 | addAvatarCollisionSubMenu(editMenu); |
| @@ -337,6 +337,8 @@ Menu::Menu() : · 140 unmodified lines | |||
| 337 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); | 337 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::DisplayHandTargets, 0, false); |
| 338 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); | 338 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::PlaySlaps, 0, false); |
| 339 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::HandsCollideWithSelf, 0, false); | 339 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::HandsCollideWithSelf, 0, false); |
| 340 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::ShowIKConstraints, 0, false); | ||
| 341 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, true); | ||
| 340 | 342 | ||
| 341 | addDisabledActionAndSeparator(developerMenu, "Testing"); | 343 | addDisabledActionAndSeparator(developerMenu, "Testing"); |
| 342 | 344 | ||
| @@ -507,7 +509,7 @@ void Menu::loadSettings(QSettings* settings) { · 164 unmodified lines | |||
| 507 | // MyAvatar caches some menu options, so we have to update them whenever we load settings. | 509 | // MyAvatar caches some menu options, so we have to update them whenever we load settings. |
| 508 | // TODO: cache more settings in MyAvatar that are checked with very high frequency. | 510 | // TODO: cache more settings in MyAvatar that are checked with very high frequency. |
| 509 | MyAvatar* myAvatar = Application::getInstance()->getAvatar(); | 511 | MyAvatar* myAvatar = Application::getInstance()->getAvatar(); |
| 510 | myAvatar->updateCollisionFlags(); | 512 | myAvatar->updateCollisionGroups(); |
| 511 | 513 | ||
| 512 | if (lockedSettings) { | 514 | if (lockedSettings) { |
| 513 | Application::getInstance()->unlockSettings(); | 515 | Application::getInstance()->unlockSettings(); |
| @@ -1351,13 +1353,13 @@ void Menu::addAvatarCollisionSubMenu(QMenu* overMenu) { · 837 unmodified lines | |||
| 1351 | Application* appInstance = Application::getInstance(); | 1353 | Application* appInstance = Application::getInstance(); |
| 1352 | QObject* avatar = appInstance->getAvatar(); | 1354 | QObject* avatar = appInstance->getAvatar(); |
| 1353 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithEnvironment, | 1355 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithEnvironment, |
| 1354 | 0, false, avatar, SLOT(updateCollisionFlags())); | 1356 | 0, false, avatar, SLOT(updateCollisionGroups())); |
| 1355 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithAvatars, | 1357 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithAvatars, |
| 1356 | 0, true, avatar, SLOT(updateCollisionFlags())); | 1358 | 0, true, avatar, SLOT(updateCollisionGroups())); |
| 1357 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithVoxels, | 1359 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithVoxels, |
| 1358 | 0, false, avatar, SLOT(updateCollisionFlags())); | 1360 | 0, false, avatar, SLOT(updateCollisionGroups())); |
| 1359 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithParticles, | 1361 | addCheckableActionToQMenuAndActionHash(subMenu, MenuOption::CollideWithParticles, |
| 1360 | 0, true, avatar, SLOT(updateCollisionFlags())); | 1362 | 0, true, avatar, SLOT(updateCollisionGroups())); |
| 1361 | } | 1363 | } |
| 1362 | 1364 | ||
| 1363 | QAction* Menu::getActionFromName(const QString& menuName, QMenu* menu) { | 1365 | QAction* Menu::getActionFromName(const QString& menuName, QMenu* menu) { |