Showing the changes to interface/src/Menu.cpp (1 of 455 files). Show all
Unified · Split
| @@ -24,7 +24,6 @@ · 23 unmodified lines | ||
| 24 | 24 | |
| 25 | 25 | #include "Application.h" |
| 26 | 26 | #include "AccountManager.h" |
| 27 | −//#include "audio/AudioIOStatsRenderer.h" | |
| 28 | 27 | #include "audio/AudioScope.h" |
| 29 | 28 | #include "avatar/AvatarManager.h" |
| 30 | 29 | #include "devices/DdeFaceTracker.h" |
| @@ -37,7 +36,6 @@ · 6 unmodified lines | ||
| 37 | 36 | #include "SpeechRecognizer.h" |
| 38 | 37 | #endif |
| 39 | 38 | #include "ui/DialogsManager.h" |
| 40 | −#include "ui/NodeBounds.h" | |
| 41 | 39 | #include "ui/StandAloneJSConsole.h" |
| 42 | 40 | #include "InterfaceLogging.h" |
| 43 | 41 | |
| @@ -256,6 +254,8 @@ Menu::Menu() { · 212 unmodified lines | ||
| 256 | 254 | avatar, SLOT(updateMotionBehavior())); |
| 257 | 255 | |
| 258 | 256 | MenuWrapper* viewMenu = addMenu("View"); |
| 257 | + | |
| 258 | + addActionToQMenuAndActionHash(viewMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); | |
| 259 | 259 | |
| 260 | 260 | addCheckableActionToQMenuAndActionHash(viewMenu, |
| 261 | 261 | MenuOption::Fullscreen, |
| @@ -268,9 +268,22 @@ Menu::Menu() { · 6 unmodified lines | ||
| 268 | 268 | qApp, |
| 269 | 269 | SLOT(setFullscreen(bool))); |
| 270 | 270 | |
| 271 | − addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, | |
| 272 | − 0, // QML Qt::Key_P, | |
| 273 | − true, qApp, SLOT(cameraMenuChanged())); | |
| 271 | + MenuWrapper* cameraModeMenu = viewMenu->addMenu("Camera Mode"); | |
| 272 | + QActionGroup* cameraModeGroup = new QActionGroup(cameraModeMenu); | |
| 273 | + cameraModeGroup->setExclusive(true); | |
| 274 | + cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu, | |
| 275 | + MenuOption::FirstPerson, 0, // QML Qt:: Key_P | |
| 276 | + false, qApp, SLOT(cameraMenuChanged()))); | |
| 277 | + cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu, | |
| 278 | + MenuOption::ThirdPerson, 0, | |
| 279 | + true, qApp, SLOT(cameraMenuChanged()))); | |
| 280 | + cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu, | |
| 281 | + MenuOption::IndependentMode, 0, | |
| 282 | + false, qApp, SLOT(cameraMenuChanged()))); | |
| 283 | + cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(cameraModeMenu, | |
| 284 | + MenuOption::FullscreenMirror, 0, // QML Qt::Key_H, | |
| 285 | + false, qApp, SLOT(cameraMenuChanged()))); | |
| 286 | + | |
| 274 | 287 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, |
| 275 | 288 | 0, //QML Qt::SHIFT | Qt::Key_H, |
| 276 | 289 | true); |
| @@ -301,13 +314,6 @@ Menu::Menu() { · 24 unmodified lines | ||
| 301 | 314 | qApp, |
| 302 | 315 | SLOT(setEnable3DTVMode(bool))); |
| 303 | 316 | |
| 304 | − | |
| 305 | − MenuWrapper* nodeBordersMenu = viewMenu->addMenu("Server Borders"); | |
| 306 | − NodeBounds& nodeBounds = qApp->getNodeBoundsDisplay(); | |
| 307 | − addCheckableActionToQMenuAndActionHash(nodeBordersMenu, MenuOption::ShowBordersEntityNodes, | |
| 308 | − Qt::CTRL | Qt::SHIFT | Qt::Key_1, false, | |
| 309 | − &nodeBounds, SLOT(setShowEntityNodes(bool))); | |
| 310 | − | |
| 311 | 317 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false); |
| 312 | 318 | |
| 313 | 319 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats); |
| @@ -329,7 +335,6 @@ Menu::Menu() { · 15 unmodified lines | ||
| 329 | 335 | 0, // QML Qt::SHIFT | Qt::Key_A, |
| 330 | 336 | true); |
| 331 | 337 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion); |
| 332 | − addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DontFadeOnOctreeServerChanges); | |
| 333 | 338 | |
| 334 | 339 | MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight); |
| 335 | 340 | QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu); |
| @@ -447,6 +452,7 @@ Menu::Menu() { · 111 unmodified lines | ||
| 447 | 452 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderBoundingCollisionShapes); |
| 448 | 453 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderLookAtVectors, 0, false); |
| 449 | 454 | addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderFocusIndicator, 0, false); |
| 455 | + addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowWhosLookingAtMe, 0, false); | |
| 450 | 456 | |
| 451 | 457 | MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands"); |
| 452 | 458 | addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false); |
| @@ -518,7 +524,9 @@ Menu::Menu() { · 65 unmodified lines | ||
| 518 | 524 | addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer); |
| 519 | 525 | addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, qApp, SLOT(runTests())); |
| 520 | 526 | addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings); |
| 527 | + addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings); | |
| 521 | 528 | addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings); |
| 529 | + addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::ShowRealtimeEntityStats); | |
| 522 | 530 | |
| 523 | 531 | auto audioIO = DependencyManager::get<AudioClient>(); |
| 524 | 532 | MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio"); |