History

Basic network simulation for metavoxels.

Andrzej Kapolka committed 12 years ago

Commit 45fb31c1 parent b796e1b5 files · +132 −5Browse files

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

Unified · Split

interface/src/Menu.cpp+10−0
@@ -45,6 +45,7 @@ · 44 unmodified lines
45#include "ui/AttachmentsDialog.h"45#include "ui/AttachmentsDialog.h"
46#include "ui/InfoView.h"46#include "ui/InfoView.h"
47#include "ui/MetavoxelEditor.h"47#include "ui/MetavoxelEditor.h"
48#include "ui/MetavoxelNetworkSimulator.h"
48#include "ui/ModelsBrowser.h"49#include "ui/ModelsBrowser.h"
49#include "ui/LoginDialog.h"50#include "ui/LoginDialog.h"
50#include "ui/NodeBounds.h"51#include "ui/NodeBounds.h"
@@ -431,6 +432,8 @@ Menu::Menu() : · 380 unmodified lines
431 QMenu* metavoxelOptionsMenu = developerMenu->addMenu("Metavoxels");432 QMenu* metavoxelOptionsMenu = developerMenu->addMenu("Metavoxels");
432 addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::DisplayHermiteData, 0, false,433 addCheckableActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::DisplayHermiteData, 0, false,
433 Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData()));434 Application::getInstance()->getMetavoxels(), SLOT(refreshVoxelData()));
435 addActionToQMenuAndActionHash(metavoxelOptionsMenu, MenuOption::NetworkSimulator, 0, this,
436 SLOT(showMetavoxelNetworkSimulator()));
434 437
435 QMenu* handOptionsMenu = developerMenu->addMenu("Hands");438 QMenu* handOptionsMenu = developerMenu->addMenu("Hands");
436 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false);439 addCheckableActionToQMenuAndActionHash(handOptionsMenu, MenuOption::AlignForearmsWithWrists, 0, false);
@@ -1378,6 +1381,13 @@ void Menu::showMetavoxelEditor() { · 941 unmodified lines
1378 _MetavoxelEditor->raise();1381 _MetavoxelEditor->raise();
1379}1382}
1380 1383
1384void Menu::showMetavoxelNetworkSimulator() {
1385 if (!_metavoxelNetworkSimulator) {
1386 _metavoxelNetworkSimulator = new MetavoxelNetworkSimulator();
1387 }
1388 _metavoxelNetworkSimulator->raise();
1389}
1390
1381void Menu::showScriptEditor() {1391void Menu::showScriptEditor() {
1382 if(!_ScriptEditor || !_ScriptEditor->isVisible()) {1392 if(!_ScriptEditor || !_ScriptEditor->isVisible()) {
1383 _ScriptEditor = new ScriptEditorWindow();1393 _ScriptEditor = new ScriptEditorWindow();