Showing the changes to interface/src/Menu.cpp (1 of 56 files). Show all
Unified · Split
| @@ -145,7 +145,8 @@ Menu::Menu() : · 144 unmodified lines | ||
| 145 | 145 | SLOT(goTo())); |
| 146 | 146 | |
| 147 | 147 | 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())); | |
| 149 | 150 | |
| 150 | 151 | addDisabledActionAndSeparator(fileMenu, "Settings"); |
| 151 | 152 | addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsImport, 0, this, SLOT(importSettings())); |
| @@ -240,7 +241,7 @@ Menu::Menu() : · 88 unmodified lines | ||
| 240 | 241 | addDisabledActionAndSeparator(viewMenu, "Stats"); |
| 241 | 242 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats, Qt::Key_Slash); |
| 242 | 243 | 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); | |
| 244 | 245 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true); |
| 245 | 246 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails())); |
| 246 | 247 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails())); |
| @@ -359,6 +360,12 @@ Menu::Menu() : · 112 unmodified lines | ||
| 359 | 360 | false, |
| 360 | 361 | appInstance->getAudio(), |
| 361 | 362 | SLOT(toggleMute())); |
| 363 | + addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioToneInjection, | |
| 364 | + 0, | |
| 365 | + false, | |
| 366 | + appInstance->getAudio(), | |
| 367 | + SLOT(toggleToneInjection())); | |
| 368 | + | |
| 362 | 369 | |
| 363 | 370 | addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel, |
| 364 | 371 | Qt::CTRL | Qt::SHIFT | Qt::Key_V, |
| @@ -392,8 +399,6 @@ void Menu::loadSettings(QSettings* settings) { · 27 unmodified lines | ||
| 392 | 399 | _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM); |
| 393 | 400 | _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS); |
| 394 | 401 | _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE); |
| 395 | − _avatarLODDistanceMultiplier = loadSetting(settings, "avatarLODDistanceMultiplier", | |
| 396 | − DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER); | |
| 397 | 402 | _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0); |
| 398 | 403 | |
| 399 | 404 | settings->beginGroup("View Frustum Offset Camera"); |
| @@ -433,7 +438,6 @@ void Menu::saveSettings(QSettings* settings) { · 33 unmodified lines | ||
| 433 | 438 | settings->setValue("maxVoxels", _maxVoxels); |
| 434 | 439 | settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond); |
| 435 | 440 | settings->setValue("voxelSizeScale", _voxelSizeScale); |
| 436 | − settings->setValue("avatarLODDistanceMultiplier", _avatarLODDistanceMultiplier); | |
| 437 | 441 | settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust); |
| 438 | 442 | settings->beginGroup("View Frustum Offset Camera"); |
| 439 | 443 | settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw); |
| @@ -934,14 +938,17 @@ void Menu::goTo() { · 494 unmodified lines | ||
| 934 | 938 | |
| 935 | 939 | int dialogReturn = gotoDialog.exec(); |
| 936 | 940 | 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()); | |
| 940 | 942 | } |
| 941 | − | |
| 942 | 943 | sendFakeEnterEvent(); |
| 943 | 944 | } |
| 944 | 945 | |
| 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 | + | |
| 945 | 952 | void Menu::multipleDestinationsDecision(const QJsonObject& userData, const QJsonObject& placeData) { |
| 946 | 953 | QMessageBox msgBox; |
| 947 | 954 | msgBox.setText("Both user and location exists with same name"); |
| @@ -1109,13 +1116,28 @@ void Menu::showMetavoxelEditor() { · 161 unmodified lines | ||
| 1109 | 1116 | } |
| 1110 | 1117 | |
| 1111 | 1118 | 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(); | |
| 1112 | 1125 | 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); | |
| 1119 | 1141 | } |
| 1120 | 1142 | } |
| 1121 | 1143 | |
| @@ -1210,7 +1232,10 @@ void Menu::autoAdjustLOD(float currentFPS) { · 88 unmodified lines | ||
| 1210 | 1232 | if (now - _lastAvatarDetailDrop > ADJUST_AVATAR_LOD_DOWN_DELAY) { |
| 1211 | 1233 | // attempt to lower the detail in proportion to the fps difference |
| 1212 | 1234 | 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); | |
| 1214 | 1239 | _lastAvatarDetailDrop = now; |
| 1215 | 1240 | } |
| 1216 | 1241 | } else if (_fastFPSAverage.getAverage() > ADJUST_LOD_UP_FPS) { |
| @@ -1256,6 +1281,12 @@ void Menu::autoAdjustLOD(float currentFPS) { · 39 unmodified lines | ||
| 1256 | 1281 | } |
| 1257 | 1282 | } |
| 1258 | 1283 | |
| 1284 | +void Menu::resetLODAdjust() { | |
| 1285 | + _fpsAverage.reset(); | |
| 1286 | + _fastFPSAverage.reset(); | |
| 1287 | + _lastAvatarDetailDrop = _lastAdjust = usecTimestampNow(); | |
| 1288 | +} | |
| 1289 | + | |
| 1259 | 1290 | void Menu::setVoxelSizeScale(float sizeScale) { |
| 1260 | 1291 | _voxelSizeScale = sizeScale; |
| 1261 | 1292 | } |