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
32#include "devices/Faceshift.h"32#include "devices/Faceshift.h"
33#include "input-plugins/SpacemouseManager.h"33#include "input-plugins/SpacemouseManager.h"
34#include "MainWindow.h"34#include "MainWindow.h"
35#include "render/DrawStatus.h"
35#include "scripting/MenuScriptingInterface.h"36#include "scripting/MenuScriptingInterface.h"
36#include "ui/AssetUploadDialogFactory.h"37#include "ui/AssetUploadDialogFactory.h"
37#include "ui/DialogsManager.h"38#include "ui/DialogsManager.h"
@@ -336,9 +337,6 @@ Menu::Menu() { · 298 unmodified lines
336 // Developer > Render >>>337 // Developer > Render >>>
337 MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");338 MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
338 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);339 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
339 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);
340 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugShadows);
341 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Antialiasing);
342 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);340 addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);
343 341
344 // Developer > Render > Ambient Light342 // Developer > Render > Ambient Light
@@ -594,7 +592,11 @@ Menu::Menu() { · 249 unmodified lines
594 592
595 // Developer > Physics >>>593 // Developer > Physics >>>
596 MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");594 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 }
598 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);600 addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);
599 601
600 // Developer > Display Crash Options602 // Developer > Display Crash Options