History

Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata

Atlante45 committed 12 years ago

Commit bdd5c292 parents 03958f2 f12da0556 files · +1023 −564Browse files

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

Unified · Split

interface/src/Menu.cpp+47−16
@@ -145,7 +145,8 @@ Menu::Menu() : · 144 unmodified lines
145145 SLOT(goTo()));
146146
147147 addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model");
148− addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadFST, 0, Application::getInstance(), SLOT(uploadFST()));
148+ addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead()));
149+ addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadSkeleton, 0, Application::getInstance(), SLOT(uploadSkeleton()));
149150
150151 addDisabledActionAndSeparator(fileMenu, "Settings");
151152 addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsImport, 0, this, SLOT(importSettings()));
@@ -240,7 +241,7 @@ Menu::Menu() : · 88 unmodified lines
240241 addDisabledActionAndSeparator(viewMenu, "Stats");
241242 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash);
242243 addActionToQMenuAndActionHash(viewMenu, MenuOption::Log, Qt::CTRL | Qt::Key_L, appInstance, SLOT(toggleLogDialog()));
243− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Oscilloscope, 0, true);
244+ addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Oscilloscope, 0, false);
244245 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
245246 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));
246247 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));
@@ -359,6 +360,12 @@ Menu::Menu() : · 112 unmodified lines
359360 false,
360361 appInstance->getAudio(),
361362 SLOT(toggleMute()));
363+ addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioToneInjection,
364+ 0,
365+ false,
366+ appInstance->getAudio(),
367+ SLOT(toggleToneInjection()));
368+
362369
363370 addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
364371 Qt::CTRL | Qt::SHIFT | Qt::Key_V,
@@ -392,8 +399,6 @@ void Menu::loadSettings(QSettings* settings) { · 27 unmodified lines
392399 _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
393400 _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS);
394401 _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE);
395− _avatarLODDistanceMultiplier = loadSetting(settings, "avatarLODDistanceMultiplier",
396− DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER);
397402 _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0);
398403
399404 settings->beginGroup("View Frustum Offset Camera");
@@ -433,7 +438,6 @@ void Menu::saveSettings(QSettings* settings) { · 33 unmodified lines
433438 settings->setValue("maxVoxels", _maxVoxels);
434439 settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond);
435440 settings->setValue("voxelSizeScale", _voxelSizeScale);
436− settings->setValue("avatarLODDistanceMultiplier", _avatarLODDistanceMultiplier);
437441 settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust);
438442 settings->beginGroup("View Frustum Offset Camera");
439443 settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw);
@@ -934,14 +938,17 @@ void Menu::goTo() { · 494 unmodified lines
934938
935939 int dialogReturn = gotoDialog.exec();
936940 if (dialogReturn == QDialog::Accepted && !gotoDialog.textValue().isEmpty()) {
937− LocationManager* manager = &LocationManager::getInstance();
938− manager->goTo(gotoDialog.textValue());
939− connect(manager, &LocationManager::multipleDestinationsFound, this, &Menu::multipleDestinationsDecision);
941+ goToUser(gotoDialog.textValue());
940942 }
941−
942943 sendFakeEnterEvent();
943944 }
944945
946+void Menu::goToUser(const QString& user) {
947+ LocationManager* manager = &LocationManager::getInstance();
948+ manager->goTo(user);
949+ connect(manager, &LocationManager::multipleDestinationsFound, this, &Menu::multipleDestinationsDecision);
950+}
951+
945952 void Menu::multipleDestinationsDecision(const QJsonObject& userData, const QJsonObject& placeData) {
946953 QMessageBox msgBox;
947954 msgBox.setText("Both user and location exists with same name");
@@ -1109,13 +1116,28 @@ void Menu::showMetavoxelEditor() { · 161 unmodified lines
11091116 }
11101117
11111118 void Menu::showChat() {
1119+ if (!_chatAction->isEnabled()) {
1120+ // Don't do anything if chat is disabled (No
1121+ // QXMPP library or xmpp is disconnected).
1122+ return;
1123+ }
1124+ QMainWindow* mainWindow = Application::getInstance()->getWindow();
11121125 if (!_chatWindow) {
1113− Application::getInstance()->getWindow()->addDockWidget(Qt::RightDockWidgetArea, _chatWindow = new ChatWindow());
1114−
1115− } else {
1116− if (!_chatWindow->toggleViewAction()->isChecked()) {
1117− _chatWindow->toggleViewAction()->trigger();
1118− }
1126+ mainWindow->addDockWidget(Qt::NoDockWidgetArea, _chatWindow = new ChatWindow());
1127+ }
1128+ if (!_chatWindow->toggleViewAction()->isChecked()) {
1129+ int width = _chatWindow->width();
1130+ int y = qMax((mainWindow->height() - _chatWindow->height()) / 2, 0);
1131+ _chatWindow->move(mainWindow->width(), y);
1132+ _chatWindow->resize(0, _chatWindow->height());
1133+ _chatWindow->toggleViewAction()->trigger();
1134+
1135+ QPropertyAnimation* slideAnimation = new QPropertyAnimation(_chatWindow, "geometry", _chatWindow);
1136+ slideAnimation->setStartValue(_chatWindow->geometry());
1137+ slideAnimation->setEndValue(QRect(mainWindow->width() - width, _chatWindow->y(),
1138+ width, _chatWindow->height()));
1139+ slideAnimation->setDuration(250);
1140+ slideAnimation->start(QAbstractAnimation::DeleteWhenStopped);
11191141 }
11201142 }
11211143
@@ -1210,7 +1232,10 @@ void Menu::autoAdjustLOD(float currentFPS) { · 88 unmodified lines
12101232 if (now - _lastAvatarDetailDrop > ADJUST_AVATAR_LOD_DOWN_DELAY) {
12111233 // attempt to lower the detail in proportion to the fps difference
12121234 float targetFps = (ADJUST_LOD_DOWN_FPS + ADJUST_LOD_UP_FPS) * 0.5f;
1213− _avatarLODDistanceMultiplier *= (targetFps / _fastFPSAverage.getAverage());
1235+ float averageFps = _fastFPSAverage.getAverage();
1236+ const float MAXIMUM_MULTIPLIER_SCALE = 2.0f;
1237+ _avatarLODDistanceMultiplier *= (averageFps < EPSILON) ? MAXIMUM_MULTIPLIER_SCALE :
1238+ qMin(MAXIMUM_MULTIPLIER_SCALE, targetFps / averageFps);
12141239 _lastAvatarDetailDrop = now;
12151240 }
12161241 } else if (_fastFPSAverage.getAverage() > ADJUST_LOD_UP_FPS) {
@@ -1256,6 +1281,12 @@ void Menu::autoAdjustLOD(float currentFPS) { · 39 unmodified lines
12561281 }
12571282 }
12581283
1284+void Menu::resetLODAdjust() {
1285+ _fpsAverage.reset();
1286+ _fastFPSAverage.reset();
1287+ _lastAvatarDetailDrop = _lastAdjust = usecTimestampNow();
1288+}
1289+
12591290 void Menu::setVoxelSizeScale(float sizeScale) {
12601291 _voxelSizeScale = sizeScale;
12611292 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t