History

Merge pull request #6930 from zzmp/feat/bubble-render-settings

Bubble up render settings from CPP to JS/QML

samcake committed 10 years ago

Commit f4e03522 parents 86b2a67 49c128531 files · +797 −948Browse files

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

Unified · Split

interface/src/Menu.cpp+6−4
@@ -32,6 +32,7 @@ · 31 unmodified lines
3232 #include "devices/Faceshift.h"
3333 #include "input-plugins/SpacemouseManager.h"
3434 #include "MainWindow.h"
35+#include "render/DrawStatus.h"
3536 #include "scripting/MenuScriptingInterface.h"
3637 #include "ui/AssetUploadDialogFactory.h"
3738 #include "ui/DialogsManager.h"
@@ -336,9 +337,6 @@ Menu::Menu() { · 298 unmodified lines
336337 // Developer > Render >>>
337338 MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
338339 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
339− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);
340− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugShadows);
341− addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Antialiasing);
342340 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);
343341
344342 // Developer > Render > Ambient Light
@@ -594,7 +592,11 @@ Menu::Menu() { · 249 unmodified lines
594592
595593 // Developer > Physics >>>
596594 MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");
597− addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);
595+ {
596+ auto drawStatusConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<render::DrawStatus>();
597+ addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned,
598+ 0, false, drawStatusConfig, SLOT(setShowNetwork(bool)));
599+ }
598600 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);
599601
600602 // Developer > Display Crash Options