History

Added "Standing HMD Sensor Mode" checkbox to menu

removed static bool isRoomTracking and instead moved into the View menu.

Anthony J. Thibault committed 11 years ago

Commit 9209e071 parent 158c1c66 files · +35 −18Browse files

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

Unified · Split

interface/src/Menu.cpp+7−4
@@ -244,16 +244,16 @@ Menu::Menu() { · 243 unmodified lines
244 SLOT(resetSize()));244 SLOT(resetSize()));
245 245
246 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::KeyboardMotorControl,246 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::KeyboardMotorControl,
247 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehavior()));247 Qt::CTRL | Qt::SHIFT | Qt::Key_K, true, avatar, SLOT(updateMotionBehaviorFromMenu()));
248 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ScriptedMotorControl, 0, true,248 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ScriptedMotorControl, 0, true,
249 avatar, SLOT(updateMotionBehavior()));249 avatar, SLOT(updateMotionBehaviorFromMenu()));
250 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);250 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::NamesAboveHeads, 0, true);
251 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);251 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::GlowWhenSpeaking, 0, true);
252 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);252 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::BlueSpeechSphere, 0, true);
253 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,253 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::EnableCharacterController, 0, true,
254 avatar, SLOT(updateMotionBehavior()));254 avatar, SLOT(updateMotionBehaviorFromMenu()));
255 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,255 addCheckableActionToQMenuAndActionHash(avatarMenu, MenuOption::ShiftHipsForIdleAnimations, 0, false,
256 avatar, SLOT(updateMotionBehavior()));256 avatar, SLOT(updateMotionBehaviorFromMenu()));
257 257
258 MenuWrapper* viewMenu = addMenu("View");258 MenuWrapper* viewMenu = addMenu("View");
259 {259 {
@@ -325,6 +325,9 @@ Menu::Menu() { · 65 unmodified lines
325 325
326 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);326 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);
327 327
328 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::StandingHMDSensorMode, 0, false,
329 avatar, SLOT(updateStandingHMDModeFromMenu()));
330
328 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats);331 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats);
329 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log,332 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log,
330 Qt::CTRL | Qt::SHIFT | Qt::Key_L,333 Qt::CTRL | Qt::SHIFT | Qt::Key_L,