History

Added Oculus Options menu

barnold1953 committed 12 years ago

Commit 4ed03e91 parent 90754e33 files · +6 −2Browse files

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

Unified · Split

interface/src/Menu.cpp+4−1
@@ -348,7 +348,6 @@ Menu::Menu() : · 347 unmodified lines
348 348
349 QMenu* avatarOptionsMenu = developerMenu->addMenu("Avatar Options");349 QMenu* avatarOptionsMenu = developerMenu->addMenu("Avatar Options");
350 350
351 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::AllowOculusCameraModeChange, 0, false);
352 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true);351 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true);
353 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::AvatarsReceiveShadows, 0, true);352 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::AvatarsReceiveShadows, 0, true);
354 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionShapes);353 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionShapes);
@@ -375,6 +374,10 @@ Menu::Menu() : · 20 unmodified lines
375 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true);374 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true);
376 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);375 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);
377 376
377 QMenu* oculusOptionsMenu = developerMenu->addMenu("Oculus Options");
378 addCheckableActionToQMenuAndActionHash(oculusOptionsMenu, MenuOption::AllowOculusCameraModeChange, 0, false);
379 addCheckableActionToQMenuAndActionHash(oculusOptionsMenu, MenuOption::DisplayOculusOverlays, 0, true);
380
378 QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");381 QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");
379 382
380 addCheckableActionToQMenuAndActionHash(handOptionsMenu,383 addCheckableActionToQMenuAndActionHash(handOptionsMenu,