Showing the changes to interface/src/Application.cpp (1 of 65 files). Show all
Unified · Split
| @@ -339,6 +339,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 338 unmodified lines | ||
| 339 | 339 | // use our MyAvatar position and quat for address manager path |
| 340 | 340 | addressManager->setPositionGetter(getPositionForPath); |
| 341 | 341 | addressManager->setOrientationGetter(getOrientationForPath); |
| 342 | + | |
| 343 | + connect(addressManager.data(), &AddressManager::rootPlaceNameChanged, this, &Application::updateWindowTitle); | |
| 342 | 344 | |
| 343 | 345 | _settings = new QSettings(this); |
| 344 | 346 | _numChangedSettings = 0; |
| @@ -917,13 +919,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 572 unmodified lines | ||
| 917 | 919 | Menu::getInstance()->triggerOption(MenuOption::Chat); |
| 918 | 920 | break; |
| 919 | 921 | |
| 920 | − case Qt::Key_N: | |
| 921 | − if (isMeta) { | |
| 922 | − Menu::getInstance()->triggerOption(MenuOption::NameLocation); | |
| 923 | − } | |
| 924 | − | |
| 925 | − break; | |
| 926 | − | |
| 927 | 922 | case Qt::Key_Up: |
| 928 | 923 | if (_myCamera.getMode() == CAMERA_MODE_MIRROR) { |
| 929 | 924 | if (!isShifted) { |
| @@ -2803,7 +2798,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 1873 unmodified lines | ||
| 2803 | 2798 | } |
| 2804 | 2799 | glEnable(GL_LIGHTING); |
| 2805 | 2800 | glEnable(GL_DEPTH_TEST); |
| 2806 | − | |
| 2801 | + | |
| 2807 | 2802 | DependencyManager::get<DeferredLightingEffect>()->prepare(); |
| 2808 | 2803 | |
| 2809 | 2804 | if (!selfAvatarOnly) { |
| @@ -2854,6 +2849,8 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 44 unmodified lines | ||
| 2854 | 2849 | |
| 2855 | 2850 | |
| 2856 | 2851 | { |
| 2852 | + DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight()); | |
| 2853 | + | |
| 2857 | 2854 | PROFILE_RANGE("DeferredLighting"); |
| 2858 | 2855 | PerformanceTimer perfTimer("lighting"); |
| 2859 | 2856 | DependencyManager::get<DeferredLightingEffect>()->render(); |
| @@ -3152,8 +3149,14 @@ void Application::updateWindowTitle(){ · 292 unmodified lines | ||
| 3152 | 3149 | |
| 3153 | 3150 | QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) "; |
| 3154 | 3151 | QString username = AccountManager::getInstance().getAccountInfo().getUsername(); |
| 3152 | + QString currentPlaceName = DependencyManager::get<AddressManager>()->getRootPlaceName(); | |
| 3153 | + | |
| 3154 | + if (currentPlaceName.isEmpty()) { | |
| 3155 | + currentPlaceName = nodeList->getDomainHandler().getHostname(); | |
| 3156 | + } | |
| 3157 | + | |
| 3155 | 3158 | QString title = QString() + (!username.isEmpty() ? username + " @ " : QString()) |
| 3156 | − + DependencyManager::get<AddressManager>()->getCurrentDomain() + connectionStatus + buildVersion; | |
| 3159 | + + currentPlaceName + connectionStatus + buildVersion; | |
| 3157 | 3160 | |
| 3158 | 3161 | #ifndef WIN32 |
| 3159 | 3162 | // crashes with vs2013/win32 |
| @@ -3165,23 +3168,34 @@ void Application::updateWindowTitle(){ · 5 unmodified lines | ||
| 3165 | 3168 | void Application::updateLocationInServer() { |
| 3166 | 3169 | |
| 3167 | 3170 | AccountManager& accountManager = AccountManager::getInstance(); |
| 3171 | + auto addressManager = DependencyManager::get<AddressManager>(); | |
| 3168 | 3172 | DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler(); |
| 3169 | 3173 | |
| 3170 | − if (accountManager.isLoggedIn() && domainHandler.isConnected() && !domainHandler.getUUID().isNull()) { | |
| 3174 | + if (accountManager.isLoggedIn() && domainHandler.isConnected() | |
| 3175 | + && (!addressManager->getRootPlaceID().isNull() || !domainHandler.getUUID().isNull())) { | |
| 3171 | 3176 | |
| 3172 | 3177 | // construct a QJsonObject given the user's current address information |
| 3173 | 3178 | QJsonObject rootObject; |
| 3174 | 3179 | |
| 3175 | 3180 | QJsonObject locationObject; |
| 3176 | 3181 | |
| 3177 | − QString pathString = DependencyManager::get<AddressManager>()->currentPath(); | |
| 3182 | + QString pathString = addressManager->currentPath(); | |
| 3178 | 3183 | |
| 3179 | 3184 | const QString LOCATION_KEY_IN_ROOT = "location"; |
| 3180 | − const QString PATH_KEY_IN_LOCATION = "path"; | |
| 3181 | − const QString DOMAIN_ID_KEY_IN_LOCATION = "domain_id"; | |
| 3182 | 3185 | |
| 3186 | + const QString PATH_KEY_IN_LOCATION = "path"; | |
| 3183 | 3187 | locationObject.insert(PATH_KEY_IN_LOCATION, pathString); |
| 3184 | − locationObject.insert(DOMAIN_ID_KEY_IN_LOCATION, domainHandler.getUUID().toString()); | |
| 3188 | + | |
| 3189 | + if (!addressManager->getRootPlaceID().isNull()) { | |
| 3190 | + const QString PLACE_ID_KEY_IN_LOCATION = "place_id"; | |
| 3191 | + locationObject.insert(PLACE_ID_KEY_IN_LOCATION, | |
| 3192 | + uuidStringWithoutCurlyBraces(addressManager->getRootPlaceID())); | |
| 3193 | + | |
| 3194 | + } else { | |
| 3195 | + const QString DOMAIN_ID_KEY_IN_LOCATION = "domain_id"; | |
| 3196 | + locationObject.insert(DOMAIN_ID_KEY_IN_LOCATION, | |
| 3197 | + uuidStringWithoutCurlyBraces(domainHandler.getUUID())); | |
| 3198 | + } | |
| 3185 | 3199 | |
| 3186 | 3200 | rootObject.insert(LOCATION_KEY_IN_ROOT, locationObject); |
| 3187 | 3201 | |
| @@ -3966,3 +3980,31 @@ float Application::getRenderResolutionScale() const { · 778 unmodified lines | ||
| 3966 | 3980 | return 1.0f; |
| 3967 | 3981 | } |
| 3968 | 3982 | } |
| 3983 | + | |
| 3984 | +int Application::getRenderAmbientLight() const { | |
| 3985 | + if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLightGlobal)) { | |
| 3986 | + return -1; | |
| 3987 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight0)) { | |
| 3988 | + return 0; | |
| 3989 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight1)) { | |
| 3990 | + return 1; | |
| 3991 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight2)) { | |
| 3992 | + return 2; | |
| 3993 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight3)) { | |
| 3994 | + return 3; | |
| 3995 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight4)) { | |
| 3996 | + return 4; | |
| 3997 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight5)) { | |
| 3998 | + return 5; | |
| 3999 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight6)) { | |
| 4000 | + return 6; | |
| 4001 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight7)) { | |
| 4002 | + return 7; | |
| 4003 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight8)) { | |
| 4004 | + return 8; | |
| 4005 | + } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight9)) { | |
| 4006 | + return 9; | |
| 4007 | + } else { | |
| 4008 | + return -1; | |
| 4009 | + } | |
| 4010 | +} | |