Showing the changes to interface/src/Application.cpp (1 of 45 files). Show all
Unified · Split
| @@ -68,6 +68,7 @@ · 67 unmodified lines | |||
| 68 | #include <MainWindow.h> | 68 | #include <MainWindow.h> |
| 69 | #include <ModelEntityItem.h> | 69 | #include <ModelEntityItem.h> |
| 70 | #include <NetworkAccessManager.h> | 70 | #include <NetworkAccessManager.h> |
| 71 | #include <NetworkingConstants.h> | ||
| 71 | #include <OctalCode.h> | 72 | #include <OctalCode.h> |
| 72 | #include <OctreeSceneStats.h> | 73 | #include <OctreeSceneStats.h> |
| 73 | #include <PacketHeaders.h> | 74 | #include <PacketHeaders.h> |
| @@ -136,6 +137,13 @@ · 62 unmodified lines | |||
| 136 | #include "ui/StandAloneJSConsole.h" | 137 | #include "ui/StandAloneJSConsole.h" |
| 137 | #include "ui/Stats.h" | 138 | #include "ui/Stats.h" |
| 138 | 139 | ||
| 140 | // ON WIndows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU | ||
| 141 | #if defined(Q_OS_WIN) | ||
| 142 | extern "C" { | ||
| 143 | _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; | ||
| 144 | } | ||
| 145 | #endif | ||
| 146 | |||
| 139 | using namespace std; | 147 | using namespace std; |
| 140 | 148 | ||
| 141 | // Starfield information | 149 | // Starfield information |
| @@ -241,7 +249,7 @@ bool setupEssentials(int& argc, char** argv) { · 99 unmodified lines | |||
| 241 | auto jsConsole = DependencyManager::set<StandAloneJSConsole>(); | 249 | auto jsConsole = DependencyManager::set<StandAloneJSConsole>(); |
| 242 | auto dialogsManager = DependencyManager::set<DialogsManager>(); | 250 | auto dialogsManager = DependencyManager::set<DialogsManager>(); |
| 243 | auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>(); | 251 | auto bandwidthRecorder = DependencyManager::set<BandwidthRecorder>(); |
| 244 | auto resouceCacheSharedItems = DependencyManager::set<ResouceCacheSharedItems>(); | 252 | auto resourceCacheSharedItems = DependencyManager::set<ResourceCacheSharedItems>(); |
| 245 | auto entityScriptingInterface = DependencyManager::set<EntityScriptingInterface>(); | 253 | auto entityScriptingInterface = DependencyManager::set<EntityScriptingInterface>(); |
| 246 | auto windowScriptingInterface = DependencyManager::set<WindowScriptingInterface>(); | 254 | auto windowScriptingInterface = DependencyManager::set<WindowScriptingInterface>(); |
| 247 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) | 255 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| @@ -418,7 +426,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 170 unmodified lines | |||
| 418 | connect(&accountManager, &AccountManager::usernameChanged, this, &Application::updateWindowTitle); | 426 | connect(&accountManager, &AccountManager::usernameChanged, this, &Application::updateWindowTitle); |
| 419 | 427 | ||
| 420 | // set the account manager's root URL and trigger a login request if we don't have the access token | 428 | // set the account manager's root URL and trigger a login request if we don't have the access token |
| 421 | accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL); | 429 | accountManager.setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); |
| 422 | UserActivityLogger::getInstance().launch(applicationVersion()); | 430 | UserActivityLogger::getInstance().launch(applicationVersion()); |
| 423 | 431 | ||
| 424 | // once the event loop has started, check and signal for an access token | 432 | // once the event loop has started, check and signal for an access token |
| @@ -646,6 +654,11 @@ void Application::initializeGL() { · 221 unmodified lines | |||
| 646 | } | 654 | } |
| 647 | #endif | 655 | #endif |
| 648 | 656 | ||
| 657 | qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION)); | ||
| 658 | qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION)); | ||
| 659 | qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR)); | ||
| 660 | qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER)); | ||
| 661 | |||
| 649 | #ifdef WIN32 | 662 | #ifdef WIN32 |
| 650 | GLenum err = glewInit(); | 663 | GLenum err = glewInit(); |
| 651 | if (GLEW_OK != err) { | 664 | if (GLEW_OK != err) { |