History

Merge branch 'master' into 19976

David Rowe committed 12 years ago

Commit 38524b32 parents 844be60 da531ac80 files · +4396 −1958Browse files

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

Unified · Split

interface/src/Menu.cpp+12−0
@@ -45,6 +45,7 @@ · 44 unmodified lines
4545 #include "ui/AttachmentsDialog.h"
4646 #include "ui/InfoView.h"
4747 #include "ui/MetavoxelEditor.h"
48+#include "ui/MetavoxelNetworkSimulator.h"
4849 #include "ui/ModelsBrowser.h"
4950 #include "ui/LoginDialog.h"
5051 #include "ui/NodeBounds.h"
@@ -431,6 +432,10 @@ Menu::Menu() : · 380 unmodified lines
431432 QMenu* metavoxelOptionsMenu = developerMenu->addMenu("Metavoxels");
432433 addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::DisplayHermiteData, 0, false,
433434 Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData()));
435+ addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderHeightfields, 0, true);
436+ addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::RenderDualContourSurfaces, 0, true);
437+ addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0, this,
438+ SLOT(showMetavoxelNetworkSimulator()));
434439
435440 QMenu* handOptionsMenu = developerMenu->addMenu("Hands");
436441 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false);
@@ -1378,6 +1383,13 @@ void Menu::showMetavoxelEditor() { · 941 unmodified lines
13781383 _MetavoxelEditor->raise();
13791384 }
13801385
1386+void Menu::showMetavoxelNetworkSimulator() {
1387+ if (!_metavoxelNetworkSimulator) {
1388+ _metavoxelNetworkSimulator = new MetavoxelNetworkSimulator();
1389+ }
1390+ _metavoxelNetworkSimulator->raise();
1391+}
1392+
13811393 void Menu::showScriptEditor() {
13821394 if(!_ScriptEditor || !_ScriptEditor->isVisible()) {
13831395 _ScriptEditor = new ScriptEditorWindow();