Showing the changes to interface/src/Application.cpp (1 of 22 files). Show all
Unified · Split
| @@ -331,7 +331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 330 unmodified lines | |||
| 331 | 331 | ||
| 332 | _applicationStartupTime = startup_time; | 332 | _applicationStartupTime = startup_time; |
| 333 | 333 | ||
| 334 | qCDebug(interface) << "[VERSION] Build sequence: " << qPrintable(applicationVersion()); | 334 | debugLog << "[VERSION] Build sequence: " << qPrintable(applicationVersion()); |
| 335 | 335 | ||
| 336 | _bookmarks = new Bookmarks(); // Before setting up the menu | 336 | _bookmarks = new Bookmarks(); // Before setting up the menu |
| 337 | 337 | ||
| @@ -529,7 +529,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 191 unmodified lines | |||
| 529 | 529 | ||
| 530 | // check first run... | 530 | // check first run... |
| 531 | if (_firstRun.get()) { | 531 | if (_firstRun.get()) { |
| 532 | qCDebug(interface) << "This is a first run..."; | 532 | debugLog << "This is a first run..."; |
| 533 | // clear the scripts, and set out script to our default scripts | 533 | // clear the scripts, and set out script to our default scripts |
| 534 | clearScriptsBeforeRunning(); | 534 | clearScriptsBeforeRunning(); |
| 535 | loadScript(DEFAULT_SCRIPTS_JS_URL); | 535 | loadScript(DEFAULT_SCRIPTS_JS_URL); |
| @@ -650,7 +650,7 @@ Application::~Application() { · 114 unmodified lines | |||
| 650 | } | 650 | } |
| 651 | 651 | ||
| 652 | void Application::initializeGL() { | 652 | void Application::initializeGL() { |
| 653 | qCDebug(interface) << "Created Display Window."; | 653 | debugLog << "Created Display Window."; |
| 654 | 654 | ||
| 655 | // initialize glut for shape drawing; Qt apparently initializes it on OS X | 655 | // initialize glut for shape drawing; Qt apparently initializes it on OS X |
| 656 | #ifndef __APPLE__ | 656 | #ifndef __APPLE__ |
| @@ -662,22 +662,22 @@ void Application::initializeGL() { · 5 unmodified lines | |||
| 662 | } | 662 | } |
| 663 | #endif | 663 | #endif |
| 664 | 664 | ||
| 665 | qCDebug(interface) << "GL Version: " << QString((const char*) glGetString(GL_VERSION)); | 665 | debugLog << "GL Version: " << QString((const char*) glGetString(GL_VERSION)); |
| 666 | qCDebug(interface) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION)); | 666 | debugLog << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION)); |
| 667 | qCDebug(interface) << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR)); | 667 | debugLog << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR)); |
| 668 | qCDebug(interface) << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER)); | 668 | debugLog << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER)); |
| 669 | 669 | ||
| 670 | #ifdef WIN32 | 670 | #ifdef WIN32 |
| 671 | GLenum err = glewInit(); | 671 | GLenum err = glewInit(); |
| 672 | if (GLEW_OK != err) { | 672 | if (GLEW_OK != err) { |
| 673 | /* Problem: glewInit failed, something is seriously wrong. */ | 673 | /* Problem: glewInit failed, something is seriously wrong. */ |
| 674 | qCDebug(interface, "Error: %s\n", glewGetErrorString(err)); | 674 | qCDebug(interfaceapp, "Error: %s\n", glewGetErrorString(err)); |
| 675 | } | 675 | } |
| 676 | qCDebug(interface, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); | 676 | qCDebug(interfaceapp, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); |
| 677 | 677 | ||
| 678 | if (wglewGetExtension("WGL_EXT_swap_control")) { | 678 | if (wglewGetExtension("WGL_EXT_swap_control")) { |
| 679 | int swapInterval = wglGetSwapIntervalEXT(); | 679 | int swapInterval = wglGetSwapIntervalEXT(); |
| 680 | qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); | 680 | qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); |
| 681 | } | 681 | } |
| 682 | #endif | 682 | #endif |
| 683 | 683 | ||
| @@ -685,15 +685,15 @@ void Application::initializeGL() { · 1 unmodified line | |||
| 685 | // TODO: Write the correct code for Linux... | 685 | // TODO: Write the correct code for Linux... |
| 686 | /* if (wglewGetExtension("WGL_EXT_swap_control")) { | 686 | /* if (wglewGetExtension("WGL_EXT_swap_control")) { |
| 687 | int swapInterval = wglGetSwapIntervalEXT(); | 687 | int swapInterval = wglGetSwapIntervalEXT(); |
| 688 | qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); | 688 | qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); |
| 689 | }*/ | 689 | }*/ |
| 690 | #endif | 690 | #endif |
| 691 | 691 | ||
| 692 | initDisplay(); | 692 | initDisplay(); |
| 693 | qCDebug(interface, "Initialized Display."); | 693 | qCDebug(interfaceapp, "Initialized Display."); |
| 694 | 694 | ||
| 695 | init(); | 695 | init(); |
| 696 | qCDebug(interface, "init() complete."); | 696 | qCDebug(interfaceapp, "init() complete."); |
| 697 | 697 | ||
| 698 | // create thread for parsing of octee data independent of the main network and rendering threads | 698 | // create thread for parsing of octee data independent of the main network and rendering threads |
| 699 | _octreeProcessor.initialize(_enableProcessOctreeThread); | 699 | _octreeProcessor.initialize(_enableProcessOctreeThread); |
| @@ -714,7 +714,7 @@ void Application::initializeGL() { · 14 unmodified lines | |||
| 714 | if (_justStarted) { | 714 | if (_justStarted) { |
| 715 | float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0; | 715 | float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0; |
| 716 | _justStarted = false; | 716 | _justStarted = false; |
| 717 | qCDebug(interface, "Startup time: %4.2f seconds.", startupTime); | 717 | qCDebug(interfaceapp, "Startup time: %4.2f seconds.", startupTime); |
| 718 | } | 718 | } |
| 719 | 719 | ||
| 720 | // update before the first render | 720 | // update before the first render |
| @@ -1801,7 +1801,7 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 1080 unmodified lines | |||
| 1801 | } | 1801 | } |
| 1802 | exportTree.writeToSVOFile(filename.toLocal8Bit().constData()); | 1802 | exportTree.writeToSVOFile(filename.toLocal8Bit().constData()); |
| 1803 | } else { | 1803 | } else { |
| 1804 | qCDebug(interface) << "No models were selected"; | 1804 | debugLog << "No models were selected"; |
| 1805 | return false; | 1805 | return false; |
| 1806 | } | 1806 | } |
| 1807 | 1807 | ||
| @@ -1899,7 +1899,7 @@ void Application::init() { · 91 unmodified lines | |||
| 1899 | 1899 | ||
| 1900 | DependencyManager::get<AddressManager>()->loadSettings(addressLookupString); | 1900 | DependencyManager::get<AddressManager>()->loadSettings(addressLookupString); |
| 1901 | 1901 | ||
| 1902 | qCDebug(interface) << "Loaded settings"; | 1902 | debugLog << "Loaded settings"; |
| 1903 | 1903 | ||
| 1904 | #ifdef __APPLE__ | 1904 | #ifdef __APPLE__ |
| 1905 | if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) { | 1905 | if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) { |
| @@ -2380,7 +2380,7 @@ int Application::sendNackPackets() { · 474 unmodified lines | |||
| 2380 | 2380 | ||
| 2381 | void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) { | 2381 | void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) { |
| 2382 | 2382 | ||
| 2383 | //qCDebug(interface) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView(); | 2383 | //debugLog << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView(); |
| 2384 | bool wantExtraDebugging = getLogger()->extraDebugging(); | 2384 | bool wantExtraDebugging = getLogger()->extraDebugging(); |
| 2385 | 2385 | ||
| 2386 | // These will be the same for all servers, so we can set them up once and then reuse for each server we send to. | 2386 | // These will be the same for all servers, so we can set them up once and then reuse for each server we send to. |
| @@ -2443,7 +2443,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 56 unmodified lines | |||
| 2443 | }); | 2443 | }); |
| 2444 | 2444 | ||
| 2445 | if (wantExtraDebugging) { | 2445 | if (wantExtraDebugging) { |
| 2446 | qCDebug(interface, "Servers: total %d, in view %d, unknown jurisdiction %d", | 2446 | qCDebug(interfaceapp, "Servers: total %d, in view %d, unknown jurisdiction %d", |
| 2447 | totalServers, inViewServers, unknownJurisdictionServers); | 2447 | totalServers, inViewServers, unknownJurisdictionServers); |
| 2448 | } | 2448 | } |
| 2449 | 2449 | ||
| @@ -2464,7 +2464,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 14 unmodified lines | |||
| 2464 | } | 2464 | } |
| 2465 | 2465 | ||
| 2466 | if (wantExtraDebugging) { | 2466 | if (wantExtraDebugging) { |
| 2467 | qCDebug(interface, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer); | 2467 | qCDebug(interfaceapp, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer); |
| 2468 | } | 2468 | } |
| 2469 | 2469 | ||
| 2470 | nodeList->eachNode([&](const SharedNodePointer& node){ | 2470 | nodeList->eachNode([&](const SharedNodePointer& node){ |
| @@ -2483,7 +2483,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 12 unmodified lines | |||
| 2483 | if (jurisdictions.find(nodeUUID) == jurisdictions.end()) { | 2483 | if (jurisdictions.find(nodeUUID) == jurisdictions.end()) { |
| 2484 | unknownView = true; // assume it's in view | 2484 | unknownView = true; // assume it's in view |
| 2485 | if (wantExtraDebugging) { | 2485 | if (wantExtraDebugging) { |
| 2486 | qCDebug(interface) << "no known jurisdiction for node " << *node << ", assume it's visible."; | 2486 | debugLog << "no known jurisdiction for node " << *node << ", assume it's visible."; |
| 2487 | } | 2487 | } |
| 2488 | } else { | 2488 | } else { |
| 2489 | const JurisdictionMap& map = (jurisdictions)[nodeUUID]; | 2489 | const JurisdictionMap& map = (jurisdictions)[nodeUUID]; |
| @@ -2503,7 +2503,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 13 unmodified lines | |||
| 2503 | } | 2503 | } |
| 2504 | } else { | 2504 | } else { |
| 2505 | if (wantExtraDebugging) { | 2505 | if (wantExtraDebugging) { |
| 2506 | qCDebug(interface) << "Jurisdiction without RootCode for node " << *node << ". That's unusual!"; | 2506 | debugLog << "Jurisdiction without RootCode for node " << *node << ". That's unusual!"; |
| 2507 | } | 2507 | } |
| 2508 | } | 2508 | } |
| 2509 | } | 2509 | } |
| @@ -2512,7 +2512,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2 unmodified lines | |||
| 2512 | _octreeQuery.setMaxOctreePacketsPerSecond(perServerPPS); | 2512 | _octreeQuery.setMaxOctreePacketsPerSecond(perServerPPS); |
| 2513 | } else if (unknownView) { | 2513 | } else if (unknownView) { |
| 2514 | if (wantExtraDebugging) { | 2514 | if (wantExtraDebugging) { |
| 2515 | qCDebug(interface) << "no known jurisdiction for node " << *node << ", give it budget of " | 2515 | debugLog << "no known jurisdiction for node " << *node << ", give it budget of " |
| 2516 | << perUnknownServer << " to send us jurisdiction."; | 2516 | << perUnknownServer << " to send us jurisdiction."; |
| 2517 | } | 2517 | } |
| 2518 | 2518 | ||
| @@ -2526,11 +2526,11 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 7 unmodified lines | |||
| 2526 | _octreeQuery.setCameraNearClip(0.1f); | 2526 | _octreeQuery.setCameraNearClip(0.1f); |
| 2527 | _octreeQuery.setCameraFarClip(0.1f); | 2527 | _octreeQuery.setCameraFarClip(0.1f); |
| 2528 | if (wantExtraDebugging) { | 2528 | if (wantExtraDebugging) { |
| 2529 | qCDebug(interface) << "Using 'minimal' camera position for node" << *node; | 2529 | debugLog << "Using 'minimal' camera position for node" << *node; |
| 2530 | } | 2530 | } |
| 2531 | } else { | 2531 | } else { |
| 2532 | if (wantExtraDebugging) { | 2532 | if (wantExtraDebugging) { |
| 2533 | qCDebug(interface) << "Using regular camera position for node" << *node; | 2533 | debugLog << "Using regular camera position for node" << *node; |
| 2534 | } | 2534 | } |
| 2535 | } | 2535 | } |
| 2536 | _octreeQuery.setMaxOctreePacketsPerSecond(perUnknownServer); | 2536 | _octreeQuery.setMaxOctreePacketsPerSecond(perUnknownServer); |
| @@ -3297,13 +3297,13 @@ void Application::updateWindowTitle(){ · 760 unmodified lines | |||
| 3297 | 3297 | ||
| 3298 | #ifndef WIN32 | 3298 | #ifndef WIN32 |
| 3299 | // crashes with vs2013/win32 | 3299 | // crashes with vs2013/win32 |
| 3300 | qCDebug(interface, "Application title set to: %s", title.toStdString().c_str()); | 3300 | qCDebug(interfaceapp, "Application title set to: %s", title.toStdString().c_str()); |
| 3301 | #endif | 3301 | #endif |
| 3302 | _window->setWindowTitle(title); | 3302 | _window->setWindowTitle(title); |
| 3303 | } | 3303 | } |
| 3304 | 3304 | ||
| 3305 | void Application::clearDomainOctreeDetails() { | 3305 | void Application::clearDomainOctreeDetails() { |
| 3306 | qCDebug(interface) << "Clearing domain octree details..."; | 3306 | debugLog << "Clearing domain octree details..."; |
| 3307 | // reset the environment so that we don't erroneously end up with multiple | 3307 | // reset the environment so that we don't erroneously end up with multiple |
| 3308 | _environment.resetToDefault(); | 3308 | _environment.resetToDefault(); |
| 3309 | 3309 | ||
| @@ -3375,7 +3375,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 65 unmodified lines | |||
| 3375 | voxelDetailsForCode(rootCode, rootDetails); | 3375 | voxelDetailsForCode(rootCode, rootDetails); |
| 3376 | _entityServerJurisdictions.unlock(); | 3376 | _entityServerJurisdictions.unlock(); |
| 3377 | 3377 | ||
| 3378 | qCDebug(interface, "model server going away...... v[%f, %f, %f, %f]", | 3378 | qCDebug(interfaceapp, "model server going away...... v[%f, %f, %f, %f]", |
| 3379 | rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s); | 3379 | rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s); |
| 3380 | 3380 | ||
| 3381 | // Add the jurisditionDetails object to the list of "fade outs" | 3381 | // Add the jurisditionDetails object to the list of "fade outs" |
| @@ -3461,7 +3461,7 @@ int Application::parseOctreeStats(const QByteArray& packet, const SharedNodePoin · 79 unmodified lines | |||
| 3461 | if (jurisdiction->find(nodeUUID) == jurisdiction->end()) { | 3461 | if (jurisdiction->find(nodeUUID) == jurisdiction->end()) { |
| 3462 | jurisdiction->unlock(); | 3462 | jurisdiction->unlock(); |
| 3463 | 3463 | ||
| 3464 | qCDebug(interface, "stats from new %s server... [%f, %f, %f, %f]", | 3464 | qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]", |
| 3465 | qPrintable(serverType), rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s); | 3465 | qPrintable(serverType), rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s); |
| 3466 | 3466 | ||
| 3467 | // Add the jurisditionDetails object to the list of "fade outs" | 3467 | // Add the jurisditionDetails object to the list of "fade outs" |
| @@ -3707,7 +3707,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 239 unmodified lines | |||
| 3707 | QNetworkRequest networkRequest = QNetworkRequest(url); | 3707 | QNetworkRequest networkRequest = QNetworkRequest(url); |
| 3708 | networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); | 3708 | networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); |
| 3709 | QNetworkReply* reply = networkAccessManager.get(networkRequest); | 3709 | QNetworkReply* reply = networkAccessManager.get(networkRequest); |
| 3710 | qCDebug(interface) << "Downloading avatar file at " << url; | 3710 | debugLog << "Downloading avatar file at " << url; |
| 3711 | QEventLoop loop; | 3711 | QEventLoop loop; |
| 3712 | QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); | 3712 | QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); |
| 3713 | loop.exec(); | 3713 | loop.exec(); |
| @@ -3756,13 +3756,13 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 42 unmodified lines | |||
| 3756 | msgBox.exec(); | 3756 | msgBox.exec(); |
| 3757 | 3757 | ||
| 3758 | if (msgBox.clickedButton() == headButton) { | 3758 | if (msgBox.clickedButton() == headButton) { |
| 3759 | qCDebug(interface) << "Chose to use for head: " << url; | 3759 | debugLog << "Chose to use for head: " << url; |
| 3760 | _myAvatar->setFaceModelURL(url); | 3760 | _myAvatar->setFaceModelURL(url); |
| 3761 | UserActivityLogger::getInstance().changedModel("head", url); | 3761 | UserActivityLogger::getInstance().changedModel("head", url); |
| 3762 | _myAvatar->sendIdentityPacket(); | 3762 | _myAvatar->sendIdentityPacket(); |
| 3763 | emit faceURLChanged(url); | 3763 | emit faceURLChanged(url); |
| 3764 | } else if (msgBox.clickedButton() == bodyButton) { | 3764 | } else if (msgBox.clickedButton() == bodyButton) { |
| 3765 | qCDebug(interface) << "Chose to use for body: " << url; | 3765 | debugLog << "Chose to use for body: " << url; |
| 3766 | _myAvatar->setSkeletonModelURL(url); | 3766 | _myAvatar->setSkeletonModelURL(url); |
| 3767 | // if the head is empty, reset it to the default head. | 3767 | // if the head is empty, reset it to the default head. |
| 3768 | if (_myAvatar->getFaceModelURLString().isEmpty()) { | 3768 | if (_myAvatar->getFaceModelURLString().isEmpty()) { |
| @@ -3774,7 +3774,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 5 unmodified lines | |||
| 3774 | _myAvatar->sendIdentityPacket(); | 3774 | _myAvatar->sendIdentityPacket(); |
| 3775 | emit skeletonURLChanged(url); | 3775 | emit skeletonURLChanged(url); |
| 3776 | } else if (msgBox.clickedButton() == bodyAndHeadButton) { | 3776 | } else if (msgBox.clickedButton() == bodyAndHeadButton) { |
| 3777 | qCDebug(interface) << "Chose to use for body + head: " << url; | 3777 | debugLog << "Chose to use for body + head: " << url; |
| 3778 | _myAvatar->setFaceModelURL(QString()); | 3778 | _myAvatar->setFaceModelURL(QString()); |
| 3779 | _myAvatar->setSkeletonModelURL(url); | 3779 | _myAvatar->setSkeletonModelURL(url); |
| 3780 | UserActivityLogger::getInstance().changedModel("skeleton", url); | 3780 | UserActivityLogger::getInstance().changedModel("skeleton", url); |
| @@ -3782,7 +3782,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 1 unmodified line | |||
| 3782 | emit faceURLChanged(QString()); | 3782 | emit faceURLChanged(QString()); |
| 3783 | emit skeletonURLChanged(url); | 3783 | emit skeletonURLChanged(url); |
| 3784 | } else { | 3784 | } else { |
| 3785 | qCDebug(interface) << "Declined to use the avatar: " << url; | 3785 | debugLog << "Declined to use the avatar: " << url; |
| 3786 | } | 3786 | } |
| 3787 | return true; | 3787 | return true; |
| 3788 | } | 3788 | } |
| @@ -3794,10 +3794,10 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { · 5 unmodified lines | |||
| 3794 | reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No); | 3794 | reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No); |
| 3795 | 3795 | ||
| 3796 | if (reply == QMessageBox::Yes) { | 3796 | if (reply == QMessageBox::Yes) { |
| 3797 | qCDebug(interface) << "Chose to run the script: " << scriptFilenameOrURL; | 3797 | debugLog << "Chose to run the script: " << scriptFilenameOrURL; |
| 3798 | loadScript(scriptFilenameOrURL); | 3798 | loadScript(scriptFilenameOrURL); |
| 3799 | } else { | 3799 | } else { |
| 3800 | qCDebug(interface) << "Declined to run the script: " << scriptFilenameOrURL; | 3800 | debugLog << "Declined to run the script: " << scriptFilenameOrURL; |
| 3801 | } | 3801 | } |
| 3802 | return true; | 3802 | return true; |
| 3803 | } | 3803 | } |
| @@ -3855,7 +3855,7 @@ void Application::handleScriptEngineLoaded(const QString& scriptFilename) { · 51 unmodified lines | |||
| 3855 | } | 3855 | } |
| 3856 | 3856 | ||
| 3857 | void Application::handleScriptLoadError(const QString& scriptFilename) { | 3857 | void Application::handleScriptLoadError(const QString& scriptFilename) { |
| 3858 | qCDebug(interface) << "Application::loadScript(), script failed to load..."; | 3858 | debugLog << "Application::loadScript(), script failed to load..."; |
| 3859 | QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load."); | 3859 | QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load."); |
| 3860 | } | 3860 | } |
| 3861 | 3861 | ||
| @@ -3877,7 +3877,7 @@ void Application::stopAllScripts(bool restart) { · 15 unmodified lines | |||
| 3877 | connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&))); | 3877 | connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&))); |
| 3878 | } | 3878 | } |
| 3879 | it.value()->stop(); | 3879 | it.value()->stop(); |
| 3880 | qCDebug(interface) << "stopping script..." << it.key(); | 3880 | debugLog << "stopping script..." << it.key(); |
| 3881 | } | 3881 | } |
| 3882 | // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities | 3882 | // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities |
| 3883 | // whenever a script stops in case it happened to have been setting joint rotations. | 3883 | // whenever a script stops in case it happened to have been setting joint rotations. |
| @@ -3889,7 +3889,7 @@ void Application::stopScript(const QString &scriptName) { · 5 unmodified lines | |||
| 3889 | const QString& scriptURLString = QUrl(scriptName).toString(); | 3889 | const QString& scriptURLString = QUrl(scriptName).toString(); |
| 3890 | if (_scriptEnginesHash.contains(scriptURLString)) { | 3890 | if (_scriptEnginesHash.contains(scriptURLString)) { |
| 3891 | _scriptEnginesHash.value(scriptURLString)->stop(); | 3891 | _scriptEnginesHash.value(scriptURLString)->stop(); |
| 3892 | qCDebug(interface) << "stopping script..." << scriptName; | 3892 | debugLog << "stopping script..." << scriptName; |
| 3893 | // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities | 3893 | // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities |
| 3894 | // whenever a script stops in case it happened to have been setting joint rotations. | 3894 | // whenever a script stops in case it happened to have been setting joint rotations. |
| 3895 | // TODO: expose animation priorities and provide a layered animation control system. | 3895 | // TODO: expose animation priorities and provide a layered animation control system. |
| @@ -3987,8 +3987,8 @@ void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject · 91 unmodified lines | |||
| 3987 | voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString()); | 3987 | voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString()); |
| 3988 | } | 3988 | } |
| 3989 | 3989 | ||
| 3990 | qCDebug(interface) << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed"; | 3990 | debugLog << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed"; |
| 3991 | qCDebug(interface) << "Destination wallet UUID for edit payments is" << voxelWalletUUID; | 3991 | debugLog << "Destination wallet UUID for edit payments is" << voxelWalletUUID; |
| 3992 | } | 3992 | } |
| 3993 | 3993 | ||
| 3994 | QString Application::getPreviousScriptLocation() { | 3994 | QString Application::getPreviousScriptLocation() { |
| @@ -4153,9 +4153,9 @@ void Application::setVSyncEnabled() { · 158 unmodified lines | |||
| 4153 | if (wglewGetExtension("WGL_EXT_swap_control")) { | 4153 | if (wglewGetExtension("WGL_EXT_swap_control")) { |
| 4154 | wglSwapIntervalEXT(vsyncOn); | 4154 | wglSwapIntervalEXT(vsyncOn); |
| 4155 | int swapInterval = wglGetSwapIntervalEXT(); | 4155 | int swapInterval = wglGetSwapIntervalEXT(); |
| 4156 | qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); | 4156 | qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); |
| 4157 | } else { | 4157 | } else { |
| 4158 | qCDebug(interface, "V-Sync is FORCED ON on this system\n"); | 4158 | qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n"); |
| 4159 | } | 4159 | } |
| 4160 | #elif defined(Q_OS_LINUX) | 4160 | #elif defined(Q_OS_LINUX) |
| 4161 | // TODO: write the poper code for linux | 4161 | // TODO: write the poper code for linux |
| @@ -4164,13 +4164,13 @@ void Application::setVSyncEnabled() { · 2 unmodified lines | |||
| 4164 | glxSwapIntervalEXT(vsyncOn); | 4164 | glxSwapIntervalEXT(vsyncOn); |
| 4165 | int swapInterval = xglGetSwapIntervalEXT(); | 4165 | int swapInterval = xglGetSwapIntervalEXT(); |
| 4166 | _isVSyncOn = swapInterval; | 4166 | _isVSyncOn = swapInterval; |
| 4167 | qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); | 4167 | qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF")); |
| 4168 | } else { | 4168 | } else { |
| 4169 | qCDebug(interface, "V-Sync is FORCED ON on this system\n"); | 4169 | qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n"); |
| 4170 | } | 4170 | } |
| 4171 | */ | 4171 | */ |
| 4172 | #else | 4172 | #else |
| 4173 | qCDebug(interface, "V-Sync is FORCED ON on this system\n"); | 4173 | qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n"); |
| 4174 | #endif | 4174 | #endif |
| 4175 | } | 4175 | } |
| 4176 | 4176 | ||
| @@ -4286,7 +4286,7 @@ void Application::notifyPacketVersionMismatch() { · 109 unmodified lines | |||
| 4286 | 4286 | ||
| 4287 | void Application::checkSkeleton() { | 4287 | void Application::checkSkeleton() { |
| 4288 | if (_myAvatar->getSkeletonModel().isActive() && !_myAvatar->getSkeletonModel().hasSkeleton()) { | 4288 | if (_myAvatar->getSkeletonModel().isActive() && !_myAvatar->getSkeletonModel().hasSkeleton()) { |
| 4289 | qCDebug(interface) << "MyAvatar model has no skeleton"; | 4289 | debugLog << "MyAvatar model has no skeleton"; |
| 4290 | 4290 | ||
| 4291 | QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded..."; | 4291 | QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded..."; |
| 4292 | QMessageBox msgBox; | 4292 | QMessageBox msgBox; |