History

Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master

Clement committed 8 years ago

Commit da08d742 parents 4ce4afe bb7d84625 files · +163 −75Browse files

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

Unified · Split

interface/src/Menu.cpp+20−0
@@ -49,6 +49,7 @@ · 48 unmodified lines
4949
5050 #include "AmbientOcclusionEffect.h"
5151 #include "RenderShadowTask.h"
52+#include "AntialiasingEffect.h"
5253
5354 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
5455 #include "SpeechRecognizer.h"
@@ -380,6 +381,25 @@ Menu::Menu() { · 325 unmodified lines
380381
381382 // Developer > Render >>>
382383 MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
384+
385+ action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AntiAliasing, 0, true);
386+ connect(action, &QAction::triggered, [action] {
387+ auto renderConfig = qApp->getRenderEngine()->getConfiguration();
388+ if (renderConfig) {
389+ auto mainViewJitterCamConfig = renderConfig->getConfig<JitterSample>("RenderMainView.JitterCam");
390+ auto mainViewAntialiasingConfig = renderConfig->getConfig<Antialiasing>("RenderMainView.Antialiasing");
391+ if (mainViewJitterCamConfig && mainViewAntialiasingConfig) {
392+ if (action->isChecked()) {
393+ mainViewJitterCamConfig->play();
394+ mainViewAntialiasingConfig->setDebugFXAA(false);
395+ } else {
396+ mainViewJitterCamConfig->none();
397+ mainViewAntialiasingConfig->setDebugFXAA(true);
398+ }
399+ }
400+ }
401+ });
402+
383403 action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Shadows, 0, true);
384404 connect(action, &QAction::triggered, [action] {
385405 auto renderConfig = qApp->getRenderEngine()->getConfiguration();