From de8153bd750fd447b5541638a61fc634f5d54d8f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Mar 2016 12:23:23 -0700 Subject: [PATCH 01/66] on windows and osx use default scripts bundled with interface --- libraries/script-engine/src/ScriptEngines.cpp | 6 +++--- libraries/script-engine/src/ScriptsModel.cpp | 2 +- libraries/shared/src/PathUtils.cpp | 11 +++++++++++ libraries/shared/src/PathUtils.h | 2 ++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index f95209d880..f005368dc4 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -13,13 +13,14 @@ #include #include +#include #include "ScriptEngine.h" #include "ScriptEngineLogging.h" #define __STR2__(x) #x #define __STR1__(x) __STR2__(x) -#define __LOC__ __FILE__ "("__STR1__(__LINE__)") : Warning Msg: " +#define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " #ifndef __APPLE__ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); @@ -213,10 +214,9 @@ QVariantList ScriptEngines::getRunning() { static const QString SETTINGS_KEY = "Settings"; -static const QString DEFAULT_SCRIPTS_JS_URL = "http://s3.amazonaws.com/hifi-public/scripts/defaultScripts.js"; void ScriptEngines::loadDefaultScripts() { - loadScript(DEFAULT_SCRIPTS_JS_URL); + loadScript(defaultScriptsFileName()); } void ScriptEngines::loadOneScript(const QString& scriptFilename) { diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 37b2551f39..8b01c9fbed 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -21,7 +21,7 @@ #include "ScriptEngineLogging.h" #define __STR2__(x) #x #define __STR1__(x) __STR2__(x) -#define __LOC__ __FILE__ "("__STR1__(__LINE__)") : Warning Msg: " +#define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " static const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 79e83e9b40..94af26db6c 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -53,3 +53,14 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); +QString defaultScriptsFileName(); + #endif // hifi_PathUtils_h From b273d5efd329cf2a898930eedf9680927748d260 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Mar 2016 13:48:19 -0700 Subject: [PATCH 02/66] fix defaultScripts filename --- libraries/shared/src/PathUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 94af26db6c..bdaf467ce9 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -56,9 +56,9 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector Date: Mon, 28 Mar 2016 16:04:45 -0700 Subject: [PATCH 03/66] make self-reverb depend on wetDryMix --- libraries/audio-client/src/AudioClient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 7e01196dc7..ce2b30d261 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -550,7 +550,7 @@ void AudioClient::configureReverb() { p.wetDryMix = 100.0f; p.preDelay = 0.0f; p.earlyGain = -96.0f; // disable ER - p.lateGain -= 12.0f; // quieter than listener reverb + p.lateGain += _reverbOptions->getWetDryMix() * (24.0f/100.0f) - 24.0f; // -0dB to -24dB, based on wetDryMix p.lateMixLeft = 0.0f; p.lateMixRight = 0.0f; From b88770228e0b91ec14fd6e12805a8297a7f94fc3 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 10:40:56 -0700 Subject: [PATCH 04/66] convert running-scripts window to use local script files --- interface/src/Application.cpp | 1 - libraries/script-engine/src/ScriptEngines.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 23 +++++++++---------- libraries/script-engine/src/ScriptsModel.h | 6 ++--- libraries/shared/src/PathUtils.cpp | 8 +++---- libraries/shared/src/PathUtils.h | 2 +- 6 files changed, 20 insertions(+), 22 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index c6669303a8..901963e343 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -224,7 +224,6 @@ static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStanda static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation).append("/script.js"); #endif -const QString DEFAULT_SCRIPTS_JS_URL = "http://s3.amazonaws.com/hifi-public/scripts/defaultScripts.js"; Setting::Handle maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS); const QHash Application::_acceptedExtensions { diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index f005368dc4..2c3f7308fa 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -216,7 +216,7 @@ QVariantList ScriptEngines::getRunning() { static const QString SETTINGS_KEY = "Settings"; void ScriptEngines::loadDefaultScripts() { - loadScript(defaultScriptsFileName()); + loadScript(defaultScriptsLocation() + "/defaultScripts.js"); } void ScriptEngines::loadOneScript(const QString& scriptFilename) { diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 8b01c9fbed..70f0f7fa68 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -15,6 +15,7 @@ #include #include +#include #include "ScriptEngine.h" #include "ScriptEngines.h" @@ -23,11 +24,7 @@ #define __STR1__(x) __STR2__(x) #define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : Warning Msg: " - -static const QString S3_URL = "http://s3.amazonaws.com/hifi-public"; -static const QString PUBLIC_URL = "http://public.highfidelity.io"; static const QString MODELS_LOCATION = "scripts/"; - static const QString PREFIX_PARAMETER_NAME = "prefix"; static const QString MARKER_PARAMETER_NAME = "marker"; static const QString IS_TRUNCATED_NAME = "IsTruncated"; @@ -63,7 +60,7 @@ ScriptsModel::ScriptsModel(QObject* parent) : connect(&_fsWatcher, &QFileSystemWatcher::directoryChanged, this, &ScriptsModel::reloadLocalFiles); reloadLocalFiles(); - reloadRemoteFiles(); + reloadDefaultFiles(); } ScriptsModel::~ScriptsModel() { @@ -140,24 +137,24 @@ void ScriptsModel::updateScriptsLocation(const QString& newPath) { reloadLocalFiles(); } -void ScriptsModel::reloadRemoteFiles() { +void ScriptsModel::reloadDefaultFiles() { if (!_loadingScripts) { _loadingScripts = true; for (int i = _treeNodes.size() - 1; i >= 0; i--) { TreeNodeBase* node = _treeNodes.at(i); if (node->getType() == TREE_NODE_TYPE_SCRIPT && - static_cast(node)->getOrigin() == SCRIPT_ORIGIN_REMOTE) + static_cast(node)->getOrigin() == SCRIPT_ORIGIN_DEFAULT) { delete node; _treeNodes.removeAt(i); } } - requestRemoteFiles(); + requestDefaultFiles(); } } -void ScriptsModel::requestRemoteFiles(QString marker) { - QUrl url(S3_URL); +void ScriptsModel::requestDefaultFiles(QString marker) { + QUrl url(defaultScriptsLocation()); QUrlQuery query; query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); if (!marker.isEmpty()) { @@ -218,7 +215,9 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { xml.readNext(); lastKey = xml.text().toString(); if (jsRegex.exactMatch(xml.text().toString())) { - _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), S3_URL + "/" + lastKey, SCRIPT_ORIGIN_REMOTE)); + _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), + defaultScriptsLocation() + "/" + lastKey, + SCRIPT_ORIGIN_DEFAULT)); } } xml.readNext(); @@ -236,7 +235,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { } if (truncated) { - requestRemoteFiles(lastKey); + requestDefaultFiles(lastKey); } // If this request was not truncated, we are done. diff --git a/libraries/script-engine/src/ScriptsModel.h b/libraries/script-engine/src/ScriptsModel.h index df9716d43b..e1902f4b23 100644 --- a/libraries/script-engine/src/ScriptsModel.h +++ b/libraries/script-engine/src/ScriptsModel.h @@ -21,7 +21,7 @@ class TreeNodeFolder; enum ScriptOrigin { SCRIPT_ORIGIN_LOCAL, - SCRIPT_ORIGIN_REMOTE + SCRIPT_ORIGIN_DEFAULT }; enum TreeNodeType { @@ -84,10 +84,10 @@ protected slots: void updateScriptsLocation(const QString& newPath); void downloadFinished(); void reloadLocalFiles(); - void reloadRemoteFiles(); + void reloadDefaultFiles(); protected: - void requestRemoteFiles(QString marker = QString()); + void requestDefaultFiles(QString marker = QString()); bool parseXML(QByteArray xmlFile); void rebuildTree(); diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index bdaf467ce9..ebaae27eb1 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -54,13 +54,13 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); -QString defaultScriptsFileName(); +QString defaultScriptsLocation(); #endif // hifi_PathUtils_h From 3aa1090cedf4ef95a4451963eba792da61085713 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 11:58:21 -0700 Subject: [PATCH 05/66] working toward allowing local files in running-scripts window --- libraries/script-engine/src/ScriptsModel.cpp | 41 +++++++++++++------- libraries/shared/src/PathUtils.cpp | 8 ++-- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 70f0f7fa68..192a1f84e5 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -155,18 +156,29 @@ void ScriptsModel::reloadDefaultFiles() { void ScriptsModel::requestDefaultFiles(QString marker) { QUrl url(defaultScriptsLocation()); - QUrlQuery query; - query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); - if (!marker.isEmpty()) { - query.addQueryItem(MARKER_PARAMETER_NAME, marker); - } - url.setQuery(query); - QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); - QNetworkReply* reply = networkAccessManager.get(request); - connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); + if (url.isLocalFile()) { + // QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); + // while (it.hasNext()) { + // QString jsFile = it.next();; + // _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), + // defaultScriptsLocation() + "/" + jsFile, + // SCRIPT_ORIGIN_DEFAULT)); + // } + } else { + QUrlQuery query; + query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); + if (!marker.isEmpty()) { + query.addQueryItem(MARKER_PARAMETER_NAME, marker); + } + url.setQuery(query); + + QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance(); + QNetworkRequest request(url); + request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); + QNetworkReply* reply = networkAccessManager.get(request); + connect(reply, SIGNAL(finished()), SLOT(downloadFinished())); + } } void ScriptsModel::downloadFinished() { @@ -179,8 +191,10 @@ void ScriptsModel::downloadFinished() { if (!data.isEmpty()) { finished = parseXML(data); } else { - qCDebug(scriptengine) << "Error: Received no data when loading remote scripts"; + qCDebug(scriptengine) << "Error: Received no data when loading default scripts"; } + } else { + qDebug() << "error is" << reply->error(); } reply->deleteLater(); @@ -214,6 +228,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) { xml.readNext(); lastKey = xml.text().toString(); + qDebug() << "lastKey = " << lastKey; if (jsRegex.exactMatch(xml.text().toString())) { _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), defaultScriptsLocation() + "/" + lastKey, @@ -230,7 +245,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { // Error handling if (xml.hasError()) { - qCDebug(scriptengine) << "Error loading remote scripts: " << xml.errorString(); + qCDebug(scriptengine) << "Error loading default scripts: " << xml.errorString(); return true; } diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index ebaae27eb1..46eb61ea72 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -56,11 +56,11 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector Date: Tue, 29 Mar 2016 13:39:35 -0700 Subject: [PATCH 06/66] works on windows now --- libraries/script-engine/src/ScriptEngines.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 14 +++++++------- libraries/shared/src/PathUtils.cpp | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 2c3f7308fa..339953cdb4 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -216,7 +216,7 @@ QVariantList ScriptEngines::getRunning() { static const QString SETTINGS_KEY = "Settings"; void ScriptEngines::loadDefaultScripts() { - loadScript(defaultScriptsLocation() + "/defaultScripts.js"); + loadScript(defaultScriptsLocation() + "/scripts/defaultScripts.js"); } void ScriptEngines::loadOneScript(const QString& scriptFilename) { diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 192a1f84e5..a94ccc9771 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -158,13 +158,13 @@ void ScriptsModel::requestDefaultFiles(QString marker) { QUrl url(defaultScriptsLocation()); if (url.isLocalFile()) { - // QDirIterator it(url.toLocalFile(), QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); - // while (it.hasNext()) { - // QString jsFile = it.next();; - // _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), - // defaultScriptsLocation() + "/" + jsFile, - // SCRIPT_ORIGIN_DEFAULT)); - // } + QString localDir = url.toLocalFile() + "/scripts"; + QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); + while (it.hasNext()) { + QString jsFullPath = it.next(); + QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator + _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT)); + } } else { QUrlQuery query; query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 46eb61ea72..4b4a9efa9e 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -56,11 +56,10 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector Date: Tue, 29 Mar 2016 13:45:09 -0700 Subject: [PATCH 07/66] cleanups --- libraries/script-engine/src/ScriptsModel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index a94ccc9771..c851f08172 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -194,7 +194,7 @@ void ScriptsModel::downloadFinished() { qCDebug(scriptengine) << "Error: Received no data when loading default scripts"; } } else { - qDebug() << "error is" << reply->error(); + qDebug() << "Error: when loading default scripts --" << reply->error(); } reply->deleteLater(); @@ -228,7 +228,6 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) { xml.readNext(); lastKey = xml.text().toString(); - qDebug() << "lastKey = " << lastKey; if (jsRegex.exactMatch(xml.text().toString())) { _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), defaultScriptsLocation() + "/" + lastKey, From 9d8e01f2a597388779d3771947e21ec848805ae4 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 15:01:23 -0700 Subject: [PATCH 08/66] lock entity-tree before moving entity-children of avatars --- interface/src/avatar/MyAvatar.cpp | 50 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 38babc4ef0..69b23388b1 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -373,32 +373,34 @@ void MyAvatar::simulate(float deltaTime) { EntityTreeRenderer* entityTreeRenderer = qApp->getEntities(); EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr; if (entityTree) { - auto now = usecTimestampNow(); - EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); - MovingEntitiesOperator moveOperator(entityTree); - forEachDescendant([&](SpatiallyNestablePointer object) { - // if the queryBox has changed, tell the entity-server - if (object->computePuffedQueryAACube() && object->getNestableType() == NestableType::Entity) { - EntityItemPointer entity = std::static_pointer_cast(object); - bool success; - AACube newCube = entity->getQueryAACube(success); - if (success) { - moveOperator.addEntityToMoveList(entity, newCube); - } - if (packetSender) { - EntityItemProperties properties = entity->getProperties(); - properties.setQueryAACubeDirty(); - properties.setLastEdited(now); - packetSender->queueEditEntityMessage(PacketType::EntityEdit, entity->getID(), properties); - entity->setLastBroadcast(usecTimestampNow()); - } + entityTree->withWriteLock([&] { + auto now = usecTimestampNow(); + EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); + MovingEntitiesOperator moveOperator(entityTree); + forEachDescendant([&](SpatiallyNestablePointer object) { + // if the queryBox has changed, tell the entity-server + if (object->computePuffedQueryAACube() && object->getNestableType() == NestableType::Entity) { + EntityItemPointer entity = std::static_pointer_cast(object); + bool success; + AACube newCube = entity->getQueryAACube(success); + if (success) { + moveOperator.addEntityToMoveList(entity, newCube); + } + if (packetSender) { + EntityItemProperties properties = entity->getProperties(); + properties.setQueryAACubeDirty(); + properties.setLastEdited(now); + packetSender->queueEditEntityMessage(PacketType::EntityEdit, entity->getID(), properties); + entity->setLastBroadcast(usecTimestampNow()); + } + } + }); + // also update the position of children in our local octree + if (moveOperator.hasMovingEntities()) { + PerformanceTimer perfTimer("recurseTreeWithOperator"); + entityTree->recurseTreeWithOperator(&moveOperator); } }); - // also update the position of children in our local octree - if (moveOperator.hasMovingEntities()) { - PerformanceTimer perfTimer("recurseTreeWithOperator"); - entityTree->recurseTreeWithOperator(&moveOperator); - } } } From 2ad02941e4fbfb3234760981366b73d2ca3afd5d Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 15:38:11 -0700 Subject: [PATCH 09/66] lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable --- libraries/script-engine/src/ScriptsModel.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index c851f08172..5a4f1734d8 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -163,6 +163,10 @@ void ScriptsModel::requestDefaultFiles(QString marker) { while (it.hasNext()) { QString jsFullPath = it.next(); QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator + #if defined(Q_OS_WIN) || defined(Q_OS_OSX) + jsFullPath = jsFullPath.toLower(); + jsPartialPath = jsPartialPath.toLower(); + #endif _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT)); } } else { @@ -274,7 +278,13 @@ void ScriptsModel::reloadLocalFiles() { const QFileInfoList localFiles = _localDirectory.entryInfoList(); for (int i = 0; i < localFiles.size(); i++) { QFileInfo file = localFiles[i]; - _treeNodes.append(new TreeNodeScript(file.fileName(), file.absoluteFilePath(), SCRIPT_ORIGIN_LOCAL)); + QString fileName = file.fileName(); + QString absPath = file.absoluteFilePath(); + #if defined(Q_OS_WIN) || defined(Q_OS_OSX) + fileName = fileName.toLower(); + absPath = absPath.toLower(); + #endif + _treeNodes.append(new TreeNodeScript(fileName, absPath, SCRIPT_ORIGIN_LOCAL)); } rebuildTree(); endResetModel(); From 537c6fa3c6e4bd680ad3c79310b511c21a96bafa Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 15:39:42 -0700 Subject: [PATCH 10/66] fix indentation --- interface/src/avatar/MyAvatar.cpp | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 69b23388b1..6aa6f57e07 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -378,23 +378,23 @@ void MyAvatar::simulate(float deltaTime) { EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender(); MovingEntitiesOperator moveOperator(entityTree); forEachDescendant([&](SpatiallyNestablePointer object) { - // if the queryBox has changed, tell the entity-server - if (object->computePuffedQueryAACube() && object->getNestableType() == NestableType::Entity) { - EntityItemPointer entity = std::static_pointer_cast(object); - bool success; - AACube newCube = entity->getQueryAACube(success); - if (success) { - moveOperator.addEntityToMoveList(entity, newCube); - } - if (packetSender) { - EntityItemProperties properties = entity->getProperties(); - properties.setQueryAACubeDirty(); - properties.setLastEdited(now); - packetSender->queueEditEntityMessage(PacketType::EntityEdit, entity->getID(), properties); - entity->setLastBroadcast(usecTimestampNow()); - } + // if the queryBox has changed, tell the entity-server + if (object->computePuffedQueryAACube() && object->getNestableType() == NestableType::Entity) { + EntityItemPointer entity = std::static_pointer_cast(object); + bool success; + AACube newCube = entity->getQueryAACube(success); + if (success) { + moveOperator.addEntityToMoveList(entity, newCube); } - }); + if (packetSender) { + EntityItemProperties properties = entity->getProperties(); + properties.setQueryAACubeDirty(); + properties.setLastEdited(now); + packetSender->queueEditEntityMessage(PacketType::EntityEdit, entity->getID(), properties); + entity->setLastBroadcast(usecTimestampNow()); + } + } + }); // also update the position of children in our local octree if (moveOperator.hasMovingEntities()) { PerformanceTimer perfTimer("recurseTreeWithOperator"); From be27eaff24f42781b518e9e05bdb3a0ef586bcaa Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 29 Mar 2016 17:51:24 -0700 Subject: [PATCH 11/66] Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights --- examples/utilities/{tools => }/render/BG.qml | 0 .../configSlider}/ConfigSlider.qml | 0 examples/utilities/render/configSlider/qmldir | 1 + examples/utilities/render/culling.qml | 114 ++++++++++++++++++ .../utilities/{tools => }/render/debug.js | 0 .../utilities/{tools => }/render/debugBG.js | 0 .../{tools => }/render/debugFramebuffer.js | 0 examples/utilities/render/debugRender.js | 21 ++++ .../{tools => }/render/framebuffer.qml | 0 .../utilities/{tools => }/render/main.qml | 1 + .../{tools => }/render/plotperf/PlotPerf.qml | 2 +- .../{tools => }/render/plotperf/qmldir | 0 .../{tools => }/render/renderStats.js | 0 .../utilities/{tools => }/render/stats.qml | 15 ++- .../utilities/tools/debugRenderCulling.js | 99 --------------- .../src/DeferredLightingEffect.cpp | 2 + .../render-utils/src/RenderDeferredTask.h | 3 +- libraries/render-utils/src/spot_light.slf | 3 + libraries/render/src/render/DrawSceneOctree.h | 28 +++-- libraries/render/src/render/DrawTask.cpp | 15 ++- libraries/render/src/render/DrawTask.h | 26 +++- 21 files changed, 211 insertions(+), 119 deletions(-) rename examples/utilities/{tools => }/render/BG.qml (100%) rename examples/utilities/{tools/render => render/configSlider}/ConfigSlider.qml (100%) create mode 100644 examples/utilities/render/configSlider/qmldir create mode 100644 examples/utilities/render/culling.qml rename examples/utilities/{tools => }/render/debug.js (100%) rename examples/utilities/{tools => }/render/debugBG.js (100%) rename examples/utilities/{tools => }/render/debugFramebuffer.js (100%) create mode 100644 examples/utilities/render/debugRender.js rename examples/utilities/{tools => }/render/framebuffer.qml (100%) rename examples/utilities/{tools => }/render/main.qml (99%) rename examples/utilities/{tools => }/render/plotperf/PlotPerf.qml (99%) rename examples/utilities/{tools => }/render/plotperf/qmldir (100%) rename examples/utilities/{tools => }/render/renderStats.js (100%) rename examples/utilities/{tools => }/render/stats.qml (85%) delete mode 100644 examples/utilities/tools/debugRenderCulling.js diff --git a/examples/utilities/tools/render/BG.qml b/examples/utilities/render/BG.qml similarity index 100% rename from examples/utilities/tools/render/BG.qml rename to examples/utilities/render/BG.qml diff --git a/examples/utilities/tools/render/ConfigSlider.qml b/examples/utilities/render/configSlider/ConfigSlider.qml similarity index 100% rename from examples/utilities/tools/render/ConfigSlider.qml rename to examples/utilities/render/configSlider/ConfigSlider.qml diff --git a/examples/utilities/render/configSlider/qmldir b/examples/utilities/render/configSlider/qmldir new file mode 100644 index 0000000000..6680ec9638 --- /dev/null +++ b/examples/utilities/render/configSlider/qmldir @@ -0,0 +1 @@ +ConfigSlider 1.0 ConfigSlider.qml \ No newline at end of file diff --git a/examples/utilities/render/culling.qml b/examples/utilities/render/culling.qml new file mode 100644 index 0000000000..e3f5e67bbe --- /dev/null +++ b/examples/utilities/render/culling.qml @@ -0,0 +1,114 @@ +// +// culling.qml +// examples/utilities/render +// +// Copyright 2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0.html +// +import QtQuick 2.5 +import QtQuick.Controls 1.4 +import "configSlider" + +Column { + id: root + spacing: 8 + property var sceneOctree: Render.getConfig("DrawSceneOctree"); + property var itemSelection: Render.getConfig("DrawItemSelection"); + + Component.onCompleted: { + sceneOctree.enabled = true; + itemSelection.enabled = true; + sceneOctree.showVisibleCells = false; + sceneOctree.showEmptyCells = false; + itemSelection.showInsideItems = false; + itemSelection.showInsideSubcellItems = false; + itemSelection.showPartialItems = false; + itemSelection.showPartialSubcellItems = false; + } + Component.onDestruction: { + sceneOctree.enabled = false; + itemSelection.enabled = false; + Render.getConfig("FetchSceneSelection").freezeFrustum = false; + Render.getConfig("CullSceneSelection").freezeFrustum = false; + } + + GroupBox { + title: "Culling" + Row { + spacing: 8 + Column { + spacing: 8 + + CheckBox { + text: "Freeze Culling Frustum" + checked: false + onCheckedChanged: { + Render.getConfig("FetchSceneSelection").freezeFrustum = checked; + Render.getConfig("CullSceneSelection").freezeFrustum = checked; + } + } + Label { + text: "Octree" + } + CheckBox { + text: "Visible Cells" + checked: root.sceneOctree.showVisibleCells + onCheckedChanged: { root.sceneOctree.showVisibleCells = checked } + } + CheckBox { + text: "Empty Cells" + checked: false + onCheckedChanged: { root.sceneOctree.showEmptyCells = checked } + } + } + Column { + spacing: 8 + + Label { + text: "Frustum Items" + } + CheckBox { + text: "Inside Items" + checked: false + onCheckedChanged: { root.itemSelection.showInsideItems = checked } + } + CheckBox { + text: "Inside Sub-cell Items" + checked: false + onCheckedChanged: { root.itemSelection.showInsideSubcellItems = checked } + } + CheckBox { + text: "Partial Items" + checked: false + onCheckedChanged: { root.itemSelection.showPartialItems = checked } + } + CheckBox { + text: "Partial Sub-cell Items" + checked: false + onCheckedChanged: { root.itemSelection.showPartialSubcellItems = checked } + } + } + } + } + + GroupBox { + title: "Render Items" + + Column{ + Repeater { + model: [ "Opaque:DrawOpaqueDeferred", "Transparent:DrawTransparentDeferred", "Light:DrawLight", + "Opaque Overlays:DrawOverlay3DOpaque", "Transparent Overlays:DrawOverlay3DTransparent" ] + ConfigSlider { + label: qsTr(modelData.split(":")[0]) + integral: true + config: Render.getConfig(modelData.split(":")[1]) + property: "maxDrawn" + max: config.numDrawn + min: -1 + } + } + } + } +} diff --git a/examples/utilities/tools/render/debug.js b/examples/utilities/render/debug.js similarity index 100% rename from examples/utilities/tools/render/debug.js rename to examples/utilities/render/debug.js diff --git a/examples/utilities/tools/render/debugBG.js b/examples/utilities/render/debugBG.js similarity index 100% rename from examples/utilities/tools/render/debugBG.js rename to examples/utilities/render/debugBG.js diff --git a/examples/utilities/tools/render/debugFramebuffer.js b/examples/utilities/render/debugFramebuffer.js similarity index 100% rename from examples/utilities/tools/render/debugFramebuffer.js rename to examples/utilities/render/debugFramebuffer.js diff --git a/examples/utilities/render/debugRender.js b/examples/utilities/render/debugRender.js new file mode 100644 index 0000000000..788c7cb4a0 --- /dev/null +++ b/examples/utilities/render/debugRender.js @@ -0,0 +1,21 @@ +// +// debugRender.js +// examples/utilities/render +// +// Sam Gateau, created on 3/22/2016. +// Copyright 2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +// Set up the qml ui +var qml = Script.resolvePath('culling.qml'); +var window = new OverlayWindow({ + title: 'Render Draws', + source: qml, + width: 300, + height: 200 +}); +window.setPosition(200, 50); +window.closed.connect(function() { Script.stop(); }); \ No newline at end of file diff --git a/examples/utilities/tools/render/framebuffer.qml b/examples/utilities/render/framebuffer.qml similarity index 100% rename from examples/utilities/tools/render/framebuffer.qml rename to examples/utilities/render/framebuffer.qml diff --git a/examples/utilities/tools/render/main.qml b/examples/utilities/render/main.qml similarity index 99% rename from examples/utilities/tools/render/main.qml rename to examples/utilities/render/main.qml index 22f263b2d0..aecd566207 100644 --- a/examples/utilities/tools/render/main.qml +++ b/examples/utilities/render/main.qml @@ -10,6 +10,7 @@ // import QtQuick 2.5 import QtQuick.Controls 1.4 +import "configSlider" Column { id: root diff --git a/examples/utilities/tools/render/plotperf/PlotPerf.qml b/examples/utilities/render/plotperf/PlotPerf.qml similarity index 99% rename from examples/utilities/tools/render/plotperf/PlotPerf.qml rename to examples/utilities/render/plotperf/PlotPerf.qml index 0e100e4e72..7141ea77d0 100644 --- a/examples/utilities/tools/render/plotperf/PlotPerf.qml +++ b/examples/utilities/render/plotperf/PlotPerf.qml @@ -1,6 +1,6 @@ // // PlotPerf.qml -// examples/utilities/tools/render +// examples/utilities/render/plotperf // // Created by Sam Gateau on 3//2016 // Copyright 2016 High Fidelity, Inc. diff --git a/examples/utilities/tools/render/plotperf/qmldir b/examples/utilities/render/plotperf/qmldir similarity index 100% rename from examples/utilities/tools/render/plotperf/qmldir rename to examples/utilities/render/plotperf/qmldir diff --git a/examples/utilities/tools/render/renderStats.js b/examples/utilities/render/renderStats.js similarity index 100% rename from examples/utilities/tools/render/renderStats.js rename to examples/utilities/render/renderStats.js diff --git a/examples/utilities/tools/render/stats.qml b/examples/utilities/render/stats.qml similarity index 85% rename from examples/utilities/tools/render/stats.qml rename to examples/utilities/render/stats.qml index aacc896444..ae5b433678 100644 --- a/examples/utilities/tools/render/stats.qml +++ b/examples/utilities/render/stats.qml @@ -1,6 +1,6 @@ // // stats.qml -// examples/utilities/tools/render +// examples/utilities/render // // Created by Zach Pomerantz on 2/8/2016 // Copyright 2016 High Fidelity, Inc. @@ -22,7 +22,7 @@ Item { anchors.fill:parent property var config: Render.getConfig("Stats") - + function evalEvenHeight() { // Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ? return (height - spacing * (children.length - 1)) / children.length @@ -65,5 +65,16 @@ Item { height: parent.evalEvenHeight() parameters: "1000:K:0:frameTriangleCount-frame-#E2334D:frameTriangleRate-rate-#1AC567-0.001-MT/s" } + + property var deferredTaskConfig: Render.getConfig("RenderDeferredTask") + property var drawLightConfig: deferredTaskConfig.getConfig("DrawLight") + + PlotPerf { + title: "Lights" + config: parent.drawLightConfig + height: parent.evalEvenHeight() + parameters: "1::0:numDrawn-frame-#E2334D" + } } + } diff --git a/examples/utilities/tools/debugRenderCulling.js b/examples/utilities/tools/debugRenderCulling.js deleted file mode 100644 index dbc5f07e0d..0000000000 --- a/examples/utilities/tools/debugRenderCulling.js +++ /dev/null @@ -1,99 +0,0 @@ -// -// debugRenderOctree.js -// examples/utilities/tools -// -// Sam Gateau -// Copyright 2016 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -Script.include("cookies.js"); - -var panel = new Panel(10, 300); -var drawOctree = Render.RenderDeferredTask.DrawSceneOctree; -Render.RenderDeferredTask.DrawSceneOctree.enabled = true; -Render.RenderDeferredTask.DrawItemSelection.enabled = true; - -panel.newCheckbox("Show Octree Cells", - function(value) { Render.RenderDeferredTask.DrawSceneOctree.showVisibleCells = value; }, - function() { return (Render.RenderDeferredTask.DrawSceneOctree.showVisibleCells); }, - function(value) { return (value); } -); -panel.newCheckbox("Show Empty Cells", - function(value) { Render.RenderDeferredTask.DrawSceneOctree.showEmptyCells = value; }, - function() { return (Render.RenderDeferredTask.DrawSceneOctree.showEmptyCells); }, - function(value) { return (value); } -); -panel.newCheckbox("Freeze Frustum", - function(value) { Render.RenderDeferredTask.FetchSceneSelection.freezeFrustum = value; Render.RenderDeferredTask.CullSceneSelection.freezeFrustum = value; }, - function() { return (Render.RenderDeferredTask.FetchSceneSelection.freezeFrustum); }, - function(value) { return (value); } -); -panel.newCheckbox("Show Inside Items", - function(value) { Render.RenderDeferredTask.DrawItemSelection.showInsideItems = value; }, - function() { return (Render.RenderDeferredTask.DrawItemSelection.showInsideItems); }, - function(value) { return (value); } -); - -panel.newCheckbox("Show Inside Subcell Items", - function(value) { Render.RenderDeferredTask.DrawItemSelection.showInsideSubcellItems = value; }, - function() { return (Render.RenderDeferredTask.DrawItemSelection.showInsideSubcellItems); }, - function(value) { return (value); } -); - -panel.newCheckbox("Show Partial Items", - function(value) { Render.RenderDeferredTask.DrawItemSelection.showPartialItems = value; }, - function() { return (Render.RenderDeferredTask.DrawItemSelection.showPartialItems); }, - function(value) { return (value); } -); - -panel.newCheckbox("Show Partial Subcell Items", - function(value) { Render.RenderDeferredTask.DrawItemSelection.showPartialSubcellItems = value; }, - function() { return (Render.RenderDeferredTask.DrawItemSelection.showPartialSubcellItems); }, - function(value) { return (value); } -); - -/* -panel.newSlider('Cells Free / Allocated', -1, 1, - function(value) { value; }, // setter - function() { return Render.RenderDeferredTask.DrawSceneOctree.numFreeCells; }, // getter - function(value) { return value; }); - -this.update = function () { - var numFree = Render.RenderDeferredTask.DrawSceneOctree.numFreeCells; - var numAlloc = Render.RenderDeferredTask.DrawSceneOctree.numAllocatedCells; - var title = [ - ' ' + name, - numFree + ' / ' + numAlloc - ].join('\t'); - - widget.editTitle({ text: title }); - slider.setMaxValue(numAlloc); -}; -*/ -function mouseMoveEvent(event) { - panel.mouseMoveEvent(event); -} - -function mousePressEvent(event) { - panel.mousePressEvent(event); -} - -function mouseReleaseEvent(event) { - panel.mouseReleaseEvent(event); -} - -Controller.mouseMoveEvent.connect(mouseMoveEvent); -Controller.mousePressEvent.connect(mousePressEvent); -Controller.mouseReleaseEvent.connect(mouseReleaseEvent); - -function scriptEnding() { - panel.destroy(); - Render.RenderDeferredTask.DrawSceneOctree.enabled = false; - Render.RenderDeferredTask.DrawItemSelection.enabled = false; -} -Script.scriptEnding.connect(scriptEnding); - - diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index f3fa4a43b2..74795e6735 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -437,6 +437,7 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo // we should be able to draw thre same geometry use DepthClamp but for unknown reason it's s not working... if ((eyeHalfPlaneDistance > -nearRadius) && (glm::distance(eyePoint, glm::vec3(light->getPosition())) < expandedRadius + nearRadius)) { + light->setShowContour(true); coneParam.w = 0.0f; batch._glUniform4fv(_spotLightLocations->coneParam, 1, reinterpret_cast< const float* >(&coneParam)); @@ -452,6 +453,7 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo batch.setProjectionTransform( projMats[side]); batch.setViewTransform(viewTransforms[side]); } else { + light->setShowContour(false); coneParam.w = 1.0f; batch._glUniform4fv(_spotLightLocations->coneParam, 1, reinterpret_cast< const float* >(&coneParam)); diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h index 0125ef79fe..9fb6802992 100755 --- a/libraries/render-utils/src/RenderDeferredTask.h +++ b/libraries/render-utils/src/RenderDeferredTask.h @@ -32,9 +32,10 @@ public: class RenderDeferred { public: + using JobModel = render::Job::Model; + void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext); - using JobModel = render::Job::Model; }; class DrawConfig : public render::Job::Config { diff --git a/libraries/render-utils/src/spot_light.slf b/libraries/render-utils/src/spot_light.slf index 69f8e836aa..1239628ac6 100644 --- a/libraries/render-utils/src/spot_light.slf +++ b/libraries/render-utils/src/spot_light.slf @@ -25,6 +25,7 @@ in vec4 _texCoord0; out vec4 _fragColor; void main(void) { + DeferredTransform deferredTransform = getDeferredTransform(); // Grab the fragment data from the uv @@ -36,6 +37,8 @@ void main(void) { // Kill if in front of the light volume float depth = frag.depthVal; if (depth < gl_FragCoord.z) { + _fragColor = vec4(1.0, 0.0, 0.0, 1.0); + return; discard; } diff --git a/libraries/render/src/render/DrawSceneOctree.h b/libraries/render/src/render/DrawSceneOctree.h index 60fc0bb2c4..530b7accac 100644 --- a/libraries/render/src/render/DrawSceneOctree.h +++ b/libraries/render/src/render/DrawSceneOctree.h @@ -20,17 +20,14 @@ namespace render { class DrawSceneOctreeConfig : public Job::Config { Q_OBJECT Q_PROPERTY(bool enabled MEMBER enabled NOTIFY dirty()) - Q_PROPERTY(bool showVisibleCells MEMBER showVisibleCells WRITE setShowVisibleCells) - Q_PROPERTY(bool showEmptyCells MEMBER showEmptyCells WRITE setShowEmptyCells) + Q_PROPERTY(bool showVisibleCells READ getShowVisibleCells WRITE setShowVisibleCells NOTIFY dirty()) + Q_PROPERTY(bool showEmptyCells READ getShowEmptyCells WRITE setShowEmptyCells NOTIFY dirty()) Q_PROPERTY(int numAllocatedCells READ getNumAllocatedCells) Q_PROPERTY(int numFreeCells READ getNumFreeCells) public: DrawSceneOctreeConfig() : Job::Config(false) {} - - bool showVisibleCells{ true }; - bool showEmptyCells{ false }; int numAllocatedCells{ 0 }; int numFreeCells{ 0 }; @@ -38,6 +35,12 @@ namespace render { int getNumAllocatedCells() const { return numAllocatedCells; } int getNumFreeCells() const { return numFreeCells; } + bool showVisibleCells{ true }; + bool showEmptyCells{ false }; + + bool getShowVisibleCells() { return showVisibleCells; } + bool getShowEmptyCells() { return showEmptyCells; } + public slots: void setShowVisibleCells(bool show) { showVisibleCells = show; emit dirty(); } void setShowEmptyCells(bool show) { showEmptyCells = show; emit dirty(); } @@ -79,10 +82,10 @@ namespace render { class DrawItemSelectionConfig : public Job::Config { Q_OBJECT Q_PROPERTY(bool enabled MEMBER enabled NOTIFY dirty()) - Q_PROPERTY(bool showInsideItems MEMBER showInsideItems WRITE setShowInsideItems) - Q_PROPERTY(bool showInsideSubcellItems MEMBER showInsideSubcellItems WRITE setShowInsideSubcellItems) - Q_PROPERTY(bool showPartialItems MEMBER showPartialItems WRITE setShowPartialItems) - Q_PROPERTY(bool showPartialSubcellItems MEMBER showPartialSubcellItems WRITE setShowPartialSubcellItems) + Q_PROPERTY(bool showInsideItems READ getShowInsideItems WRITE setShowInsideItems NOTIFY dirty()) + Q_PROPERTY(bool showInsideSubcellItems READ getShowInsideSubcellItems WRITE setShowInsideSubcellItems NOTIFY dirty()) + Q_PROPERTY(bool showPartialItems READ getShowPartialItems WRITE setShowPartialItems NOTIFY dirty()) + Q_PROPERTY(bool showPartialSubcellItems READ getShowPartialSubcellItems WRITE setShowPartialSubcellItems NOTIFY dirty()) public: DrawItemSelectionConfig() : Job::Config(false) {} @@ -92,7 +95,12 @@ namespace render { bool showPartialItems{ true }; bool showPartialSubcellItems{ true }; - public slots: + bool getShowInsideItems() const { return showInsideItems; }; + bool getShowInsideSubcellItems() const { return showInsideSubcellItems; }; + bool getShowPartialItems() const { return showPartialItems; }; + bool getShowPartialSubcellItems() const { return showPartialSubcellItems; }; + + public slots: void setShowInsideItems(bool show) { showInsideItems = show; emit dirty(); } void setShowInsideSubcellItems(bool show) { showInsideSubcellItems = show; emit dirty(); } void setShowPartialItems(bool show) { showPartialItems = show; emit dirty(); } diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 733f7d9e9c..08ff97fd17 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -20,12 +20,16 @@ using namespace render; -void render::renderItems(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inItems) { +void render::renderItems(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inItems, int maxDrawnItems) { auto& scene = sceneContext->_scene; RenderArgs* args = renderContext->args; - for (const auto& itemDetails : inItems) { - auto& item = scene->getItem(itemDetails.id); + int numItemsToDraw = (int)inItems.size(); + if (maxDrawnItems != -1) { + numItemsToDraw = glm::min(numItemsToDraw, maxDrawnItems); + } + for (auto i = 0; i < numItemsToDraw; ++i) { + auto& item = scene->getItem(inItems[i].id); item.render(args); } } @@ -69,7 +73,10 @@ void DrawLight::run(const SceneContextPointer& sceneContext, const RenderContext // render lights gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { args->_batch = &batch; - renderItems(sceneContext, renderContext, inLights); + renderItems(sceneContext, renderContext, inLights, _maxDrawn); args->_batch = nullptr; }); + + auto config = std::static_pointer_cast(renderContext->jobConfig); + config->setNumDrawn((int)inLights.size()); } diff --git a/libraries/render/src/render/DrawTask.h b/libraries/render/src/render/DrawTask.h index fc2ab9682f..8a0f951028 100755 --- a/libraries/render/src/render/DrawTask.h +++ b/libraries/render/src/render/DrawTask.h @@ -16,15 +16,37 @@ namespace render { -void renderItems(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inItems); +void renderItems(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inItems, int maxDrawnItems = -1); void renderShapes(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ShapePlumberPointer& shapeContext, const ItemBounds& inItems, int maxDrawnItems = -1); + + +class DrawLightConfig : public Job::Config { + Q_OBJECT + Q_PROPERTY(int numDrawn READ getNumDrawn NOTIFY numDrawnChanged) + Q_PROPERTY(int maxDrawn MEMBER maxDrawn NOTIFY dirty) +public: + int getNumDrawn() { return numDrawn; } + void setNumDrawn(int num) { numDrawn = num; emit numDrawnChanged(); } + + int maxDrawn{ -1 }; +signals: + void numDrawnChanged(); + void dirty(); + +protected: + int numDrawn{ 0 }; +}; + class DrawLight { public: - using JobModel = Job::ModelI; + using Config = DrawLightConfig; + using JobModel = Job::ModelI; + void configure(const Config& config) { _maxDrawn = config.maxDrawn; } void run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inLights); protected: + int _maxDrawn; // initialized by Config }; } From 7c0bb72affad37496a437331133a1a3e42948a14 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Mar 2016 18:32:46 -0700 Subject: [PATCH 12/66] started on making ~ mean the application directory in script paths --- libraries/script-engine/src/ScriptEngines.cpp | 39 +++++++++++++++++-- libraries/script-engine/src/ScriptEngines.h | 3 ++ libraries/script-engine/src/ScriptsModel.cpp | 20 +++------- libraries/shared/src/PathUtils.cpp | 4 +- 4 files changed, 46 insertions(+), 20 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 339953cdb4..a62deb89bc 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -43,24 +43,55 @@ ScriptEngines::ScriptEngines() } QString normalizeScriptUrl(const QString& rawScriptUrl) { - if (!rawScriptUrl.startsWith("http:") && !rawScriptUrl.startsWith("https:") && !rawScriptUrl.startsWith("atp:")) { + if (!rawScriptUrl.startsWith("http:") && !rawScriptUrl.startsWith("https:") && !rawScriptUrl.startsWith("atp:")) { #ifdef Q_OS_LINUX if (rawScriptUrl.startsWith("file:")) { return rawScriptUrl; } return QUrl::fromLocalFile(rawScriptUrl).toString(); #else + QString fullNormal; if (rawScriptUrl.startsWith("file:")) { - return rawScriptUrl.toLower(); + fullNormal = rawScriptUrl.toLower(); + } else { + // Force lowercase on file scripts because of drive letter weirdness. + fullNormal = QUrl::fromLocalFile(rawScriptUrl).toString().toLower(); } - // Force lowercase on file scripts because of drive letter weirdness. - return QUrl::fromLocalFile(rawScriptUrl).toString().toLower(); + QString defaultScriptLoc = defaultScriptsLocation(); + if (fullNormal.startsWith(defaultScriptLoc)) { + return "~" + fullNormal.mid(defaultScriptLoc.size()); + } + return fullNormal; #endif } return QUrl(rawScriptUrl).toString(); } +QString expandScriptUrl(const QString& normalizedScriptURL) { + if (normalizedScriptURL.startsWith("http:") || + normalizedScriptURL.startsWith("https:") || + normalizedScriptURL.startsWith("atp:")) { + return QUrl(normalizedScriptURL).toString(); + } + + QUrl url; + if (normalizedScriptURL.startsWith("file:")) { + url = QUrl(normalizedScriptURL); + } else { + url = QUrl::fromLocalFile(normalizedScriptURL); + } + + QString path = url.path(); + QStringList splitPath = path.split("/"); + if (splitPath.size() > 0 && splitPath[0] == "~") { + QString defaultScriptLoc = defaultScriptsLocation(); + url.setPath(defaultScriptLoc + splitPath.mid(1).join("/")); + return url.toString(); + } +} + + QObject* scriptsModel(); void ScriptEngines::registerScriptInitializer(ScriptInitializer initializer) { diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h index df60d6ff63..ab0d17d9f3 100644 --- a/libraries/script-engine/src/ScriptEngines.h +++ b/libraries/script-engine/src/ScriptEngines.h @@ -96,4 +96,7 @@ protected: ScriptsModelFilter _scriptsModelFilter; }; +QString normalizeScriptUrl(const QString& rawScriptUrl); +QString expandScriptUrl(const QString& normalizedScriptURL); + #endif // hifi_ScriptEngine_h diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 5a4f1734d8..5b368095e0 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -161,12 +161,8 @@ void ScriptsModel::requestDefaultFiles(QString marker) { QString localDir = url.toLocalFile() + "/scripts"; QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { - QString jsFullPath = it.next(); - QString jsPartialPath = jsFullPath.mid(localDir.length() + 1); // + 1 to skip a separator - #if defined(Q_OS_WIN) || defined(Q_OS_OSX) - jsFullPath = jsFullPath.toLower(); - jsPartialPath = jsPartialPath.toLower(); - #endif + QString jsFullPath = normalizeScriptUrl(it.next()); + QString jsPartialPath = normalizeScriptUrl(jsFullPath.mid(localDir.length() + 1)); // + 1 to skip a separator _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT)); } } else { @@ -231,7 +227,7 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == CONTAINER_NAME)) { if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) { xml.readNext(); - lastKey = xml.text().toString(); + lastKey = normalizeScriptUrl(xml.text().toString()); if (jsRegex.exactMatch(xml.text().toString())) { _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), defaultScriptsLocation() + "/" + lastKey, @@ -278,12 +274,8 @@ void ScriptsModel::reloadLocalFiles() { const QFileInfoList localFiles = _localDirectory.entryInfoList(); for (int i = 0; i < localFiles.size(); i++) { QFileInfo file = localFiles[i]; - QString fileName = file.fileName(); - QString absPath = file.absoluteFilePath(); - #if defined(Q_OS_WIN) || defined(Q_OS_OSX) - fileName = fileName.toLower(); - absPath = absPath.toLower(); - #endif + QString fileName = normalizeScriptUrl(file.fileName()); + QString absPath = normalizeScriptUrl(file.absoluteFilePath()); _treeNodes.append(new TreeNodeScript(fileName, absPath, SCRIPT_ORIGIN_LOCAL)); } rebuildTree(); @@ -310,7 +302,7 @@ void ScriptsModel::rebuildTree() { for (pathIterator = pathList.constBegin(); pathIterator != pathList.constEnd(); ++pathIterator) { hash.append(*pathIterator + "/"); if (!folders.contains(hash)) { - folders[hash] = new TreeNodeFolder(*pathIterator, parent); + folders[hash] = new TreeNodeFolder(normalizeScriptUrl(*pathIterator), parent); } parent = folders[hash]; } diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 4b4a9efa9e..2e8d4a4e6a 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -56,9 +56,9 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector Date: Wed, 30 Mar 2016 09:32:40 -0700 Subject: [PATCH 13/66] DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region --- libraries/render-utils/src/DeferredLightingEffect.cpp | 4 ++-- libraries/render-utils/src/spot_light.slf | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 74795e6735..a0b8f0ae84 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -435,9 +435,9 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo float expandedRadius = light->getMaximumRadius() * (1.0f + SCALE_EXPANSION); // TODO: We shouldn;t have to do that test and use a different volume geometry for when inside the vlight volume, // we should be able to draw thre same geometry use DepthClamp but for unknown reason it's s not working... + const float OVER_CONSERVATIVE_SCALE = 1.1; if ((eyeHalfPlaneDistance > -nearRadius) && - (glm::distance(eyePoint, glm::vec3(light->getPosition())) < expandedRadius + nearRadius)) { - light->setShowContour(true); + (glm::distance(eyePoint, glm::vec3(light->getPosition())) < (expandedRadius * OVER_CONSERVATIVE_SCALE) + nearRadius)) { coneParam.w = 0.0f; batch._glUniform4fv(_spotLightLocations->coneParam, 1, reinterpret_cast< const float* >(&coneParam)); diff --git a/libraries/render-utils/src/spot_light.slf b/libraries/render-utils/src/spot_light.slf index 1239628ac6..8355dcf91b 100644 --- a/libraries/render-utils/src/spot_light.slf +++ b/libraries/render-utils/src/spot_light.slf @@ -37,8 +37,6 @@ void main(void) { // Kill if in front of the light volume float depth = frag.depthVal; if (depth < gl_FragCoord.z) { - _fragColor = vec4(1.0, 0.0, 0.0, 1.0); - return; discard; } From d056c41e251d6586f0f0d54e013d487daee2a025 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 4 Mar 2016 13:55:24 -0800 Subject: [PATCH 14/66] Update to latest Oculus SDK, add input device support --- cmake/externals/LibOVR/CMakeLists.txt | 23 +- .../src/controllers/StandardControls.h | 3 + .../oculus/src/OculusBaseDisplayPlugin.cpp | 20 +- plugins/oculus/src/OculusBaseDisplayPlugin.h | 1 - .../oculus/src/OculusControllerManager.cpp | 218 ++++++++++++++++++ plugins/oculus/src/OculusControllerManager.h | 82 +++++++ plugins/oculus/src/OculusDisplayPlugin.cpp | 2 +- plugins/oculus/src/OculusHelpers.cpp | 39 +++- plugins/oculus/src/OculusHelpers.h | 4 +- plugins/oculus/src/OculusProvider.cpp | 4 +- 10 files changed, 354 insertions(+), 42 deletions(-) create mode 100644 plugins/oculus/src/OculusControllerManager.cpp create mode 100644 plugins/oculus/src/OculusControllerManager.h diff --git a/cmake/externals/LibOVR/CMakeLists.txt b/cmake/externals/LibOVR/CMakeLists.txt index a98745b404..5b8a689a9a 100644 --- a/cmake/externals/LibOVR/CMakeLists.txt +++ b/cmake/externals/LibOVR/CMakeLists.txt @@ -12,19 +12,16 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) # 0.5 public # URL http://static.oculus.com/sdk-downloads/ovr_sdk_win_0.5.0.1.zip # URL_MD5 d3fc4c02db9be5ff08af4ef4c97b32f9 -# 0.6 public -# URL http://static.oculus.com/sdk-downloads/0.6.0.1/Public/1435190862/ovr_sdk_win_0.6.0.1.zip -# URL_MD5 4b3ef825f9a1d6d3035c9f6820687da9 -# 0.8 public -# URL http://static.oculus.com/sdk-downloads/0.8.0.0/Public/1445451746/ovr_sdk_win_0.8.0.0.zip -# URL_MD5 54944b03b95149d6010f84eb701b9647 +# 1.3 public +# URL http://hifi-public.s3.amazonaws.com/dependencies/ovr_sdk_win_1.3.0_public.zip +# URL_MD5 4d26faba0c1f35ff80bf674c96ed9259 if (WIN32) ExternalProject_Add( ${EXTERNAL_NAME} - URL http://static.oculus.com/sdk-downloads/0.8.0.0/Public/1445451746/ovr_sdk_win_0.8.0.0.zip - URL_MD5 54944b03b95149d6010f84eb701b9647 + URL http://hifi-public.s3.amazonaws.com/dependencies/ovr_sdk_win_1.3.0_public.zip + URL_MD5 a2dcf695e0f03a70fdd1ed7480585e82 CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" @@ -33,14 +30,16 @@ if (WIN32) ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR) - # FIXME need to account for different architectures - set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/LibOVR/Include CACHE TYPE INTERNAL) + set(LIBOVR_DIR ${SOURCE_DIR}/OculusSDK/LibOVR) if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/LibOVR/Lib/Windows/x64/Release/VS2013/LibOVR.lib CACHE TYPE INTERNAL) + set(LIBOVR_LIB_DIR ${LIBOVR_DIR}/Lib/Windows/x64/Release/VS2013 CACHE TYPE INTERNAL) else() - set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/LibOVR/Lib/Windows/Win32/Release/VS2013/LibOVR.lib CACHE TYPE INTERNAL) + set(LIBOVR_LIB_DIR ${LIBOVR_DIR}/Lib/Windows/Win32/Release/VS2013 CACHE TYPE INTERNAL) endif() + set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${LIBOVR_DIR}/Include CACHE TYPE INTERNAL) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${LIBOVR_LIB_DIR}/LibOVR.lib CACHE TYPE INTERNAL) + elseif(APPLE) ExternalProject_Add( diff --git a/libraries/controllers/src/controllers/StandardControls.h b/libraries/controllers/src/controllers/StandardControls.h index 2b0613321e..f101ba6c51 100644 --- a/libraries/controllers/src/controllers/StandardControls.h +++ b/libraries/controllers/src/controllers/StandardControls.h @@ -81,6 +81,9 @@ namespace controller { // Triggers LT, RT, + // Grips (Oculus touch squeeze) + LG, + RG, NUM_STANDARD_AXES, LZ = LT, RZ = RT diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index e23d8cade6..8f4e8d665d 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -12,7 +12,7 @@ #include "OculusHelpers.h" void OculusBaseDisplayPlugin::resetSensors() { - ovr_RecenterPose(_session); + ovr_RecenterTrackingOrigin(_session); } void OculusBaseDisplayPlugin::updateHeadPose(uint32_t frameIndex) { @@ -42,36 +42,30 @@ bool OculusBaseDisplayPlugin::internalActivate() { _hmdDesc = ovr_GetHmdDesc(_session); - _ipd = ovr_GetFloat(_session, OVR_KEY_IPD, _ipd); - glm::uvec2 eyeSizes[2]; _viewScaleDesc.HmdSpaceToWorldScaleInMeters = 1.0f; + _ipd = 0; ovr_for_each_eye([&](ovrEyeType eye) { _eyeFovs[eye] = _hmdDesc.DefaultEyeFov[eye]; ovrEyeRenderDesc& erd = _eyeRenderDescs[eye] = ovr_GetRenderDesc(_session, eye, _eyeFovs[eye]); ovrMatrix4f ovrPerspectiveProjection = - ovrMatrix4f_Projection(erd.Fov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_RightHanded); + ovrMatrix4f_Projection(erd.Fov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_ClipRangeOpenGL); _eyeProjections[eye] = toGlm(ovrPerspectiveProjection); - _eyeOffsets[eye] = glm::translate(mat4(), toGlm(erd.HmdToEyeViewOffset)); + _eyeOffsets[eye] = glm::translate(mat4(), toGlm(erd.HmdToEyeOffset)); eyeSizes[eye] = toGlm(ovr_GetFovTextureSize(_session, eye, erd.Fov, 1.0f)); - _viewScaleDesc.HmdToEyeViewOffset[eye] = erd.HmdToEyeViewOffset; + _viewScaleDesc.HmdToEyeOffset[eye] = erd.HmdToEyeOffset; + _ipd += glm::abs(glm::length(toGlm(erd.HmdToEyeOffset))); }); auto combinedFov = _eyeFovs[0]; combinedFov.LeftTan = combinedFov.RightTan = std::max(combinedFov.LeftTan, combinedFov.RightTan); - _cullingProjection = toGlm(ovrMatrix4f_Projection(combinedFov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_RightHanded)); + _cullingProjection = toGlm(ovrMatrix4f_Projection(combinedFov, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP, ovrProjection_ClipRangeOpenGL)); _renderTargetSize = uvec2( eyeSizes[0].x + eyeSizes[1].x, std::max(eyeSizes[0].y, eyeSizes[1].y)); - if (!OVR_SUCCESS(ovr_ConfigureTracking(_session, - ovrTrackingCap_Orientation | ovrTrackingCap_Position | ovrTrackingCap_MagYawCorrection, 0))) { - logWarning("Failed to attach to sensor device"); - } - - // Parent class relies on our _session intialization, so it must come after that. memset(&_sceneLayer, 0, sizeof(ovrLayerEyeFov)); _sceneLayer.Header.Type = ovrLayerType_EyeFov; _sceneLayer.Header.Flags = ovrLayerFlag_TextureOriginAtBottomLeft; diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h index d21b0561bc..b5ec0769e0 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.h +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h @@ -30,7 +30,6 @@ protected: protected: ovrSession _session; ovrGraphicsLuid _luid; - float _ipd{ OVR_DEFAULT_IPD }; ovrEyeRenderDesc _eyeRenderDescs[2]; ovrFovPort _eyeFovs[2]; ovrHmdDesc _hmdDesc; diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp new file mode 100644 index 0000000000..0761dc1655 --- /dev/null +++ b/plugins/oculus/src/OculusControllerManager.cpp @@ -0,0 +1,218 @@ +// +// OculusControllerManager.cpp +// input-plugins/src/input-plugins +// +// Created by Bradley Austin Davis 2016/03/04. +// Copyright 2013-2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "OculusControllerManager.h" + +#include + +#include +#include +#include + +#include +#include + +#include "OculusHelpers.h" + +Q_DECLARE_LOGGING_CATEGORY(oculus) + + +static const QString MENU_PARENT = "Avatar"; +static const QString MENU_NAME = "Oculus Touch Controllers"; +static const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME; + +const QString OculusControllerManager::NAME = "Oculus"; + +bool OculusControllerManager::isSupported() const { + return oculusAvailable(); +} + +void OculusControllerManager::activate() { + InputPlugin::activate(); + if (!_session) { + _session = acquireOculusSession(); + } + Q_ASSERT(_session); + + // register with UserInputMapper + auto userInputMapper = DependencyManager::get(); + if (_remote) { + userInputMapper->registerDevice(_remote); + } + if (_touch) { + userInputMapper->registerDevice(_touch); + } +} + +void OculusControllerManager::deactivate() { + InputPlugin::deactivate(); + + if (_session) { + releaseOculusSession(); + _session = nullptr; + } + + // unregister with UserInputMapper + auto userInputMapper = DependencyManager::get(); + if (_touch) { + userInputMapper->removeDevice(_touch->getDeviceID()); + } + if (_remote) { + userInputMapper->removeDevice(_remote->getDeviceID()); + } +} + +void OculusControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) { + PerformanceTimer perfTimer("OculusControllerManager::TouchDevice::update"); + + if (!OVR_SUCCESS(ovr_GetInputState(_session, ovrControllerType_Touch, &_inputState))) { + qCWarning(oculus) << "Unable to read oculus input state"; + return; + } + + if (_touch) { + _touch->update(deltaTime, inputCalibrationData, jointsCaptured); + } + if (_remote) { + _remote->update(deltaTime, inputCalibrationData, jointsCaptured); + } +} + +void OculusControllerManager::pluginFocusOutEvent() { + if (_touch) { + _touch->focusOutEvent(); + } + if (_remote) { + _remote->focusOutEvent(); + } +} + +using namespace controller; + +static const std::vector> BUTTON_MAP { { + { ovrButton_X, X }, + { ovrButton_Y, Y }, + { ovrButton_A, A }, + { ovrButton_B, B }, + { ovrButton_LThumb, LS }, + { ovrButton_RThumb, RS }, + { ovrButton_LShoulder, LB }, + { ovrButton_RShoulder, RB }, +} }; + +static const std::vector> TOUCH_MAP { { + { ovrTouch_X, LEFT_SECONDARY_THUMB_TOUCH }, + { ovrTouch_Y, LEFT_SECONDARY_THUMB_TOUCH }, + { ovrTouch_A, RIGHT_SECONDARY_THUMB_TOUCH }, + { ovrTouch_B, RIGHT_SECONDARY_THUMB_TOUCH }, + { ovrTouch_LIndexTrigger, LEFT_PRIMARY_INDEX_TOUCH }, + { ovrTouch_RIndexTrigger, RIGHT_PRIMARY_INDEX_TOUCH }, + { ovrTouch_LThumb, LS_TOUCH }, + { ovrTouch_RThumb, RS_TOUCH }, + { ovrTouch_LThumbUp, LEFT_THUMB_UP }, + { ovrTouch_RThumbUp, RIGHT_THUMB_UP }, + { ovrTouch_LIndexPointing, LEFT_INDEX_POINT }, + { ovrTouch_RIndexPointing, RIGHT_INDEX_POINT }, +} }; + +void OculusControllerManager::TouchDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) { + _poseStateMap.clear(); + _buttonPressedMap.clear(); + + if (!jointsCaptured) { + int numTrackedControllers = 0; + static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked & ovrStatus_PositionTracked; + auto tracking = ovr_GetTrackingState(_parent._session, 0, false); + ovr_for_each_hand([&](ovrHandType hand) { + ++numTrackedControllers; + if (REQUIRED_HAND_STATUS == (tracking.HandStatusFlags[hand] & REQUIRED_HAND_STATUS)) { + handlePose(deltaTime, inputCalibrationData, hand, tracking.HandPoses[hand]); + } + }); + } + using namespace controller; + // Axes + const auto& inputState = _parent._inputState; + _axisStateMap[LX] = inputState.Thumbstick[ovrHand_Left].x; + _axisStateMap[LY] = inputState.Thumbstick[ovrHand_Left].y; + _axisStateMap[LT] = inputState.IndexTrigger[ovrHand_Left]; + _axisStateMap[LG] = inputState.HandTrigger[ovrHand_Left]; + + _axisStateMap[RX] = inputState.Thumbstick[ovrHand_Right].x; + _axisStateMap[RY] = inputState.Thumbstick[ovrHand_Right].y; + _axisStateMap[RT] = inputState.IndexTrigger[ovrHand_Right]; + _axisStateMap[RG] = inputState.HandTrigger[ovrHand_Right]; + + // Buttons + for (const auto& pair : BUTTON_MAP) { + if (inputState.Buttons & pair.first) { + _buttonPressedMap.insert(pair.second); + } + } + // Touches + for (const auto& pair : TOUCH_MAP) { + if (inputState.Touches & pair.first) { + _buttonPressedMap.insert(pair.second); + } + } +} + +void OculusControllerManager::TouchDevice::focusOutEvent() { + _axisStateMap.clear(); + _buttonPressedMap.clear(); +}; + +void OculusControllerManager::TouchDevice::handlePose(float deltaTime, + const controller::InputCalibrationData& inputCalibrationData, ovrHandType hand, + const ovrPoseStatef& handPose) { + auto poseId = hand == ovrHand_Left ? controller::LEFT_HAND : controller::RIGHT_HAND; + auto& pose = _poseStateMap[poseId]; + pose.translation = toGlm(handPose.ThePose.Position); + pose.rotation = toGlm(handPose.ThePose.Orientation); + pose.angularVelocity = toGlm(handPose.AngularVelocity); + pose.velocity = toGlm(handPose.LinearVelocity); +} + +controller::Input::NamedVector OculusControllerManager::TouchDevice::getAvailableInputs() const { + using namespace controller; + QVector availableInputs{ + // Trackpad analogs + makePair(LX, "LX"), + makePair(LY, "LY"), + makePair(RX, "RX"), + makePair(RY, "RY"), + // trigger analogs + makePair(LT, "LT"), + makePair(RT, "RT"), + + makePair(LB, "LB"), + makePair(RB, "RB"), + + makePair(LS, "LS"), + makePair(RS, "RS"), + makePair(LEFT_HAND, "LeftHand"), + makePair(RIGHT_HAND, "RightHand"), + + makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"), + makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"), + makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"), + makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"), + }; + return availableInputs; +} + +QString OculusControllerManager::TouchDevice::getDefaultMappingConfig() const { + static const QString MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/touch.json"; + return MAPPING_JSON; +} + + + diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h new file mode 100644 index 0000000000..7a30b19aa4 --- /dev/null +++ b/plugins/oculus/src/OculusControllerManager.h @@ -0,0 +1,82 @@ +// +// Created by Bradley Austin Davis on 2016/03/04 +// Copyright 2013-2016 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi__OculusControllerManager +#define hifi__OculusControllerManager + +#include +#include + +#include + +#include +#include + +#include + +class OculusControllerManager : public InputPlugin { + Q_OBJECT +public: + // Plugin functions + bool isSupported() const override; + bool isJointController() const override { return true; } + const QString& getName() const override { return NAME; } + + void activate() override; + void deactivate() override; + + void pluginFocusOutEvent() override; + void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override; + +private: + class OculusInputDevice : public controller::InputDevice { + public: + OculusInputDevice(OculusControllerManager& parent, const QString& name) : controller::InputDevice(name), _parent(parent) {} + + OculusControllerManager& _parent; + friend class OculusControllerManager; + }; + + // Waiting on touch API + class RemoteDevice : public OculusInputDevice { + public: + using Pointer = std::shared_ptr; + RemoteDevice(OculusControllerManager& parent) : OculusInputDevice(parent, "Oculus Remote") {} + + controller::Input::NamedVector getAvailableInputs() const override; + QString getDefaultMappingConfig() const override; + void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override; + void focusOutEvent() override; + + friend class OculusControllerManager; + }; + + class TouchDevice : public OculusInputDevice { + public: + using Pointer = std::shared_ptr; + TouchDevice(OculusControllerManager& parent) : OculusInputDevice(parent, "Oculus Touch") {} + + controller::Input::NamedVector getAvailableInputs() const override; + QString getDefaultMappingConfig() const override; + void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, bool jointsCaptured) override; + void focusOutEvent() override; + + private: + void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData, ovrHandType hand, const ovrPoseStatef& handPose); + int _trackedControllers { 0 }; + friend class OculusControllerManager; + }; + + ovrSession _session { nullptr }; + ovrInputState _inputState {}; + RemoteDevice::Pointer _remote; + TouchDevice::Pointer _touch; + static const QString NAME; +}; + +#endif // hifi__OculusControllerManager diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp index 8c3a676c61..1a5a32ffb2 100644 --- a/plugins/oculus/src/OculusDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusDisplayPlugin.cpp @@ -70,5 +70,5 @@ void OculusDisplayPlugin::hmdPresent() { logWarning("Failed to present"); } } - _sceneFbo->Increment(); + _sceneFbo->Commit(); } diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index 170be05952..d38303919e 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -98,9 +98,8 @@ SwapFramebufferWrapper::~SwapFramebufferWrapper() { destroyColor(); } -void SwapFramebufferWrapper::Increment() { - ++color->CurrentIndex; - color->CurrentIndex %= color->TextureCount; +void SwapFramebufferWrapper::Commit() { + ovr_CommitTextureSwapChain(_session, color); } void SwapFramebufferWrapper::Resize(const uvec2 & size) { @@ -114,7 +113,7 @@ void SwapFramebufferWrapper::Resize(const uvec2 & size) { void SwapFramebufferWrapper::destroyColor() { if (color) { - ovr_DestroySwapTextureSet(_session, color); + ovr_DestroyTextureSwapChain(_session, color); color = nullptr; } } @@ -122,13 +121,30 @@ void SwapFramebufferWrapper::destroyColor() { void SwapFramebufferWrapper::initColor() { destroyColor(); - if (!OVR_SUCCESS(ovr_CreateSwapTextureSetGL(_session, GL_SRGB8_ALPHA8, size.x, size.y, &color))) { + ovrTextureSwapChainDesc desc = {}; + desc.Type = ovrTexture_2D; + desc.ArraySize = 1; + desc.Width = size.x; + desc.Height = size.y; + desc.MipLevels = 1; + desc.Format = OVR_FORMAT_R8G8B8A8_UNORM_SRGB; + desc.SampleCount = 1; + desc.StaticImage = ovrFalse; + + ovrResult result = ovr_CreateTextureSwapChainGL(_session, &desc, &color); + if (!OVR_SUCCESS(result)) { logFatal("Failed to create swap textures"); } - for (int i = 0; i < color->TextureCount; ++i) { - ovrGLTexture& ovrTex = (ovrGLTexture&)color->Textures[i]; - glBindTexture(GL_TEXTURE_2D, ovrTex.OGL.TexId); + int length = 0; + result = ovr_GetTextureSwapChainLength(_session, color, &length); + if (!OVR_SUCCESS(result) || !length) { + qFatal("Unable to count swap chain textures"); + } + for (int i = 0; i < length; ++i) { + GLuint chainTexId; + ovr_GetTextureSwapChainBufferGL(_session, color, i, &chainTexId); + glBindTexture(GL_TEXTURE_2D, chainTexId); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); @@ -141,8 +157,11 @@ void SwapFramebufferWrapper::initDone() { } void SwapFramebufferWrapper::onBind(oglplus::Framebuffer::Target target) { - ovrGLTexture& tex = (ovrGLTexture&)(color->Textures[color->CurrentIndex]); - glFramebufferTexture2D(toEnum(target), GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex.OGL.TexId, 0); + int curIndex; + ovr_GetTextureSwapChainCurrentIndex(_session, color, &curIndex); + GLuint curTexId; + ovr_GetTextureSwapChainBufferGL(_session, color, curIndex, &curTexId); + glFramebufferTexture2D(toEnum(target), GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, curTexId, 0); } void SwapFramebufferWrapper::onUnbind(oglplus::Framebuffer::Target target) { diff --git a/plugins/oculus/src/OculusHelpers.h b/plugins/oculus/src/OculusHelpers.h index e10e058ad2..2f13c45466 100644 --- a/plugins/oculus/src/OculusHelpers.h +++ b/plugins/oculus/src/OculusHelpers.h @@ -111,10 +111,10 @@ inline ovrPosef ovrPoseFromGlm(const glm::mat4 & m) { // then submit it and increment to the next texture. // The Oculus SDK manages the creation and destruction of // the textures -struct SwapFramebufferWrapper : public FramebufferWrapper { +struct SwapFramebufferWrapper : public FramebufferWrapper { SwapFramebufferWrapper(const ovrSession& session); ~SwapFramebufferWrapper(); - void Increment(); + void Commit(); void Resize(const uvec2 & size); protected: void initColor() override final; diff --git a/plugins/oculus/src/OculusProvider.cpp b/plugins/oculus/src/OculusProvider.cpp index be708db932..e723fa839a 100644 --- a/plugins/oculus/src/OculusProvider.cpp +++ b/plugins/oculus/src/OculusProvider.cpp @@ -18,6 +18,7 @@ #include "OculusDisplayPlugin.h" #include "OculusDebugDisplayPlugin.h" +#include "OculusControllerManager.h" class OculusProvider : public QObject, public DisplayProvider, InputProvider { @@ -51,8 +52,6 @@ public: } virtual InputPluginList getInputPlugins() override { - // FIXME pending full oculus input API and hardware -#if 0 static std::once_flag once; std::call_once(once, [&] { InputPluginPointer plugin(new OculusControllerManager()); @@ -60,7 +59,6 @@ public: _inputPlugins.push_back(plugin); } }); -#endif return _inputPlugins; } From bd9813bbf59c48f69a8767d3ad0d72a1830bb1ae Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 28 Mar 2016 12:00:40 -0700 Subject: [PATCH 15/66] Only enable the Oculus plugin in the presence of the 1.x runtime --- plugins/oculus/src/OculusBaseDisplayPlugin.h | 2 +- plugins/oculus/src/OculusControllerManager.h | 1 - plugins/oculus/src/OculusHelpers.cpp | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h index b5ec0769e0..41344335f3 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.h +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h @@ -28,7 +28,7 @@ protected: void internalDeactivate() override; protected: - ovrSession _session; + ovrSession _session { nullptr }; ovrGraphicsLuid _luid; ovrEyeRenderDesc _eyeRenderDescs[2]; ovrFovPort _eyeFovs[2]; diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h index 7a30b19aa4..fb126ca2a8 100644 --- a/plugins/oculus/src/OculusControllerManager.h +++ b/plugins/oculus/src/OculusControllerManager.h @@ -42,7 +42,6 @@ private: friend class OculusControllerManager; }; - // Waiting on touch API class RemoteDevice : public OculusInputDevice { public: using Pointer = std::shared_ptr; diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index d38303919e..fdd35a06fe 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -9,7 +9,9 @@ #include "OculusHelpers.h" #include + #include +#include using Mutex = std::mutex; using Lock = std::unique_lock; @@ -38,9 +40,21 @@ void logFatal(const char* what) { qFatal(error.c_str()); } +static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" }; + bool oculusAvailable() { ovrDetectResult detect = ovr_Detect(0); - return (detect.IsOculusServiceRunning && detect.IsOculusHMDConnected); + if (!detect.IsOculusServiceRunning || !detect.IsOculusHMDConnected) { + return false; + } + + // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it + // doesn't exist + if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) { + return false; + } + + return true; } ovrSession acquireOculusSession() { From 78626f793831bd603e4dbdf400cafcb18a631a92 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 28 Mar 2016 13:00:15 -0700 Subject: [PATCH 16/66] Add warning logging if we can't find a 1.x Oculus dll --- plugins/oculus/src/OculusHelpers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index fdd35a06fe..cfac175392 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -51,6 +51,7 @@ bool oculusAvailable() { // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it // doesn't exist if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) { + qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present."; return false; } From 80d397555ddb7388d8a60ea054df58b6eb30047c Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 28 Mar 2016 14:45:09 -0700 Subject: [PATCH 17/66] Fixing input API, DLL path for Oculus --- plugins/oculus/src/OculusControllerManager.cpp | 3 ++- plugins/oculus/src/OculusControllerManager.h | 2 +- plugins/oculus/src/OculusHelpers.cpp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/oculus/src/OculusControllerManager.cpp b/plugins/oculus/src/OculusControllerManager.cpp index 0761dc1655..f11ec18b10 100644 --- a/plugins/oculus/src/OculusControllerManager.cpp +++ b/plugins/oculus/src/OculusControllerManager.cpp @@ -35,7 +35,7 @@ bool OculusControllerManager::isSupported() const { return oculusAvailable(); } -void OculusControllerManager::activate() { +bool OculusControllerManager::activate() { InputPlugin::activate(); if (!_session) { _session = acquireOculusSession(); @@ -50,6 +50,7 @@ void OculusControllerManager::activate() { if (_touch) { userInputMapper->registerDevice(_touch); } + return true; } void OculusControllerManager::deactivate() { diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h index fb126ca2a8..fc10dcc73d 100644 --- a/plugins/oculus/src/OculusControllerManager.h +++ b/plugins/oculus/src/OculusControllerManager.h @@ -27,7 +27,7 @@ public: bool isJointController() const override { return true; } const QString& getName() const override { return NAME; } - void activate() override; + bool activate() override; void deactivate() override; void pluginFocusOutEvent() override; diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index cfac175392..fb49d1d001 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -12,6 +12,7 @@ #include #include +#include using Mutex = std::mutex; using Lock = std::unique_lock; @@ -40,7 +41,8 @@ void logFatal(const char* what) { qFatal(error.c_str()); } -static const QString GOOD_OCULUS_RUNTIME_FILE { "C:\\Program Files(x86)\\Oculus\\Support\\oculus - runtime\\LibOVRRT64_1.dll" }; +static const QString OCULUS_RUNTIME_PATH { "C:\\Program Files (x86)\\Oculus\\Support\\oculus-runtime" }; +static const QString GOOD_OCULUS_RUNTIME_FILE { OCULUS_RUNTIME_PATH + "\\LibOVRRT64_1.dll" }; bool oculusAvailable() { ovrDetectResult detect = ovr_Detect(0); From 8123617fe1e50e695b28368a2b0beb474768f173 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 29 Mar 2016 09:41:38 -0700 Subject: [PATCH 18/66] Improve failure detection logging --- plugins/oculus/src/OculusHelpers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index fb49d1d001..98dfa43fa2 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -53,7 +53,7 @@ bool oculusAvailable() { // HACK Explicitly check for the presence of the 1.0 runtime DLL, and fail if it // doesn't exist if (!QFile(GOOD_OCULUS_RUNTIME_FILE).exists()) { - qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present."; + qCWarning(oculus) << "Oculus Runtime detected, but no 1.x DLL present: \"" + GOOD_OCULUS_RUNTIME_FILE + "\""; return false; } From f569cbf70ef40c15699acb31ef374e5b31c25cee Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 30 Mar 2016 09:56:26 -0700 Subject: [PATCH 19/66] Add debugging output, fix timewarp --- interface/src/Application.cpp | 25 +++++++++++------ .../display-plugins/OpenGLDisplayPlugin.cpp | 4 +-- .../src/display-plugins/OpenGLDisplayPlugin.h | 2 +- .../display-plugins/hmd/HmdDisplayPlugin.cpp | 28 ++++++++++++++----- .../display-plugins/hmd/HmdDisplayPlugin.h | 18 +++++++++--- libraries/plugins/src/plugins/DisplayPlugin.h | 4 ++- libraries/shared/src/ThreadSafeValueCache.h | 1 + .../oculus/src/OculusBaseDisplayPlugin.cpp | 15 ++++++---- plugins/oculus/src/OculusBaseDisplayPlugin.h | 3 +- plugins/oculus/src/OculusDisplayPlugin.cpp | 28 ++++++++++++++----- plugins/oculus/src/OculusDisplayPlugin.h | 3 +- plugins/oculus/src/OculusHelpers.cpp | 3 +- .../src/OculusLegacyDisplayPlugin.cpp | 10 +++++-- .../src/OculusLegacyDisplayPlugin.h | 2 +- plugins/openvr/src/OpenVrDisplayPlugin.cpp | 22 +++++++++------ plugins/openvr/src/OpenVrDisplayPlugin.h | 2 +- 16 files changed, 117 insertions(+), 53 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index de9b134b83..895f3fd52f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1490,11 +1490,15 @@ void Application::paintGL() { // FIXME not needed anymore? _offscreenContext->makeCurrent(); - displayPlugin->updateHeadPose(_frameCount); + displayPlugin->beginFrameRender(_frameCount); // update the avatar with a fresh HMD pose getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose()); + // update sensorToWorldMatrix for camera and hand controllers + getMyAvatar()->updateSensorToWorldMatrix(); + + auto lodManager = DependencyManager::get(); @@ -2007,6 +2011,12 @@ void Application::keyPressEvent(QKeyEvent* event) { } break; + case Qt::Key_Y: + if (isShifted && isMeta) { + getActiveDisplayPlugin()->cycleDebugOutput(); + } + break; + case Qt::Key_B: if (isMeta) { auto offscreenUi = DependencyManager::get(); @@ -2572,11 +2582,6 @@ void Application::idle(uint64_t now) { return; // bail early, nothing to do here. } - checkChangeCursor(); - - Stats::getInstance()->updateStats(); - AvatarInputs::getInstance()->update(); - // These tasks need to be done on our first idle, because we don't want the showing of // overlay subwindows to do a showDesktop() until after the first time through static bool firstIdle = true; @@ -2625,6 +2630,11 @@ void Application::idle(uint64_t now) { // We're going to execute idle processing, so restart the last idle timer _lastTimeUpdated.start(); + checkChangeCursor(); + + Stats::getInstance()->updateStats(); + AvatarInputs::getInstance()->update(); + { static uint64_t lastIdleStart{ now }; uint64_t idleStartToStartDuration = now - lastIdleStart; @@ -3389,9 +3399,6 @@ void Application::update(float deltaTime) { qApp->updateMyAvatarLookAtPosition(); - // update sensorToWorldMatrix for camera and hand controllers - myAvatar->updateSensorToWorldMatrix(); - { PROFILE_RANGE_EX("MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount()); avatarManager->updateMyAvatar(deltaTime); diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 8049e2d5a5..e5d98d18f7 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -552,9 +552,9 @@ float OpenGLDisplayPlugin::presentRate() { { Lock lock(_mutex); result = _usecsPerFrame.getAverage(); - result = 1.0f / result; - result *= USECS_PER_SECOND; } + result = 1.0f / result; + result *= USECS_PER_SECOND; return result; } diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h index b9628deb6c..8c4862ee3d 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h @@ -17,9 +17,9 @@ #include #include #include +#include #define THREADED_PRESENT 1 -#include class OpenGLDisplayPlugin : public DisplayPlugin { protected: diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 5be3f0d96a..505fa004ab 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -69,10 +69,11 @@ void HmdDisplayPlugin::compositeOverlay() { // set the alpha Uniform(*_program, _alphaUniform).Set(overlayAlpha); + auto eyePoses = _currentPresentFrameInfo.eyePoses; _sphereSection->Use(); for_each_eye([&](Eye eye) { eyeViewport(eye); - auto modelView = glm::inverse(_currentRenderEyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1)); + auto modelView = glm::inverse(eyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1)); auto mvp = _eyeProjections[eye] * modelView; Uniform(*_program, _mvpUniform).Set(mvp); _sphereSection->Draw(); @@ -95,10 +96,10 @@ void HmdDisplayPlugin::compositePointer() { // Mouse pointer _plane->Use(); // Reconstruct the headpose from the eye poses - auto headPosition = (vec3(_currentRenderEyePoses[Left][3]) + vec3(_currentRenderEyePoses[Right][3])) / 2.0f; + auto headPosition = vec3(_currentPresentFrameInfo.headPose[3]); for_each_eye([&](Eye eye) { eyeViewport(eye); - auto reticleTransform = compositorHelper->getReticleTransform(_currentRenderEyePoses[eye], headPosition); + auto reticleTransform = compositorHelper->getReticleTransform(_currentPresentFrameInfo.eyePoses[eye], headPosition); auto mvp = _eyeProjections[eye] * reticleTransform; Uniform(*_program, _mvpUniform).Set(mvp); _plane->Draw(); @@ -160,15 +161,28 @@ void HmdDisplayPlugin::internalPresent() { void HmdDisplayPlugin::setEyeRenderPose(uint32_t frameIndex, Eye eye, const glm::mat4& pose) { Lock lock(_mutex); - _renderEyePoses[frameIndex][eye] = pose; + FrameInfo& frame = _frameInfos[frameIndex]; + frame.eyePoses[eye] = pose; } void HmdDisplayPlugin::updateFrameData() { + // Check if we have old frame data to discard + { + Lock lock(_mutex); + auto itr = _frameInfos.find(_currentRenderFrameIndex); + if (itr != _frameInfos.end()) { + _frameInfos.erase(itr); + } + } + Parent::updateFrameData(); - Lock lock(_mutex); - _currentRenderEyePoses = _renderEyePoses[_currentRenderFrameIndex]; + + { + Lock lock(_mutex); + _currentPresentFrameInfo = _frameInfos[_currentRenderFrameIndex]; + } } glm::mat4 HmdDisplayPlugin::getHeadPose() const { - return _headPoseCache.get(); + return _currentRenderFrameInfo.get().headPose; } diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h index 080a44bc66..899dd6636a 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h @@ -28,6 +28,16 @@ public: virtual glm::mat4 getHeadPose() const override; + using EyePoses = std::array; + + struct FrameInfo { + EyePoses eyePoses; + glm::mat4 headPose; + double sensorSampleTime { 0 }; + double predictedDisplayTime { 0 }; + }; + + protected: virtual void hmdPresent() = 0; virtual bool isHmdMounted() const = 0; @@ -46,10 +56,10 @@ protected: glm::mat4 _cullingProjection; glm::uvec2 _renderTargetSize; float _ipd { 0.064f }; - using EyePoses = std::array; - QMap _renderEyePoses; - EyePoses _currentRenderEyePoses; - ThreadSafeValueCache _headPoseCache { glm::mat4() }; + + QMap _frameInfos; + FrameInfo _currentPresentFrameInfo; + ThreadSafeValueCache _currentRenderFrameInfo; private: bool _enablePreview { false }; diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h index f4f28176c7..77d984f924 100644 --- a/libraries/plugins/src/plugins/DisplayPlugin.h +++ b/libraries/plugins/src/plugins/DisplayPlugin.h @@ -122,7 +122,7 @@ public: } // will query the underlying hmd api to compute the most recent head pose - virtual void updateHeadPose(uint32_t frameIndex) {} + virtual void beginFrameRender(uint32_t frameIndex) {} // returns a copy of the most recent head pose, computed via updateHeadPose virtual glm::mat4 getHeadPose() const { @@ -142,6 +142,8 @@ public: virtual float presentRate() { return -1.0f; } uint32_t presentCount() const { return _presentedFrameIndex; } + virtual void cycleDebugOutput() {} + static const QString& MENU_PATH(); signals: diff --git a/libraries/shared/src/ThreadSafeValueCache.h b/libraries/shared/src/ThreadSafeValueCache.h index e4e78ca3d7..37a1258aa1 100644 --- a/libraries/shared/src/ThreadSafeValueCache.h +++ b/libraries/shared/src/ThreadSafeValueCache.h @@ -23,6 +23,7 @@ template class ThreadSafeValueCache { public: + ThreadSafeValueCache() {} ThreadSafeValueCache(const T& v) : _value { v } {} // returns atomic copy of the cached value. diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index 8f4e8d665d..52eb70134d 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -15,11 +15,16 @@ void OculusBaseDisplayPlugin::resetSensors() { ovr_RecenterTrackingOrigin(_session); } -void OculusBaseDisplayPlugin::updateHeadPose(uint32_t frameIndex) { - auto displayTime = ovr_GetPredictedDisplayTime(_session, frameIndex); - auto trackingState = ovr_GetTrackingState(_session, displayTime, true); - mat4 headPose = toGlm(trackingState.HeadPose.ThePose); - _headPoseCache.set(headPose); +void OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) { + FrameInfo frame; + frame.sensorSampleTime = ovr_GetTimeInSeconds();; + frame.predictedDisplayTime = ovr_GetPredictedDisplayTime(_session, frameIndex); + auto trackingState = ovr_GetTrackingState(_session, frame.predictedDisplayTime, ovrTrue); + frame.headPose = toGlm(trackingState.HeadPose.ThePose); + + _currentRenderFrameInfo.set(frame); + Lock lock(_mutex); + _frameInfos[frameIndex] = frame; } bool OculusBaseDisplayPlugin::isSupported() const { diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.h b/plugins/oculus/src/OculusBaseDisplayPlugin.h index 41344335f3..2259a4ca89 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.h +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.h @@ -20,7 +20,8 @@ public: // Stereo specific methods virtual void resetSensors() override final; - virtual void updateHeadPose(uint32_t frameIndex) override; + virtual void beginFrameRender(uint32_t frameIndex) override; + protected: void customizeContext() override; diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp index 1a5a32ffb2..8078e8d6ec 100644 --- a/plugins/oculus/src/OculusDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusDisplayPlugin.cpp @@ -10,6 +10,23 @@ #include "OculusHelpers.h" const QString OculusDisplayPlugin::NAME("Oculus Rift"); +static ovrPerfHudMode currentDebugMode = ovrPerfHud_Off; + +bool OculusDisplayPlugin::internalActivate() { + bool result = Parent::internalActivate(); + currentDebugMode = ovrPerfHud_Off; + if (result && _session) { + ovr_SetInt(_session, OVR_PERF_HUD_MODE, currentDebugMode); + } + return result; +} + +void OculusDisplayPlugin::cycleDebugOutput() { + if (_session) { + currentDebugMode = static_cast((currentDebugMode + 1) % ovrPerfHud_Count); + ovr_SetInt(_session, OVR_PERF_HUD_MODE, currentDebugMode); + } +} void OculusDisplayPlugin::customizeContext() { Parent::customizeContext(); @@ -48,12 +65,6 @@ void blit(const SrcFbo& srcFbo, const DstFbo& dstFbo) { }); } -void OculusDisplayPlugin::updateFrameData() { - Parent::updateFrameData(); - _sceneLayer.RenderPose[ovrEyeType::ovrEye_Left] = ovrPoseFromGlm(_currentRenderEyePoses[Left]); - _sceneLayer.RenderPose[ovrEyeType::ovrEye_Right] = ovrPoseFromGlm(_currentRenderEyePoses[Right]); -} - void OculusDisplayPlugin::hmdPresent() { PROFILE_RANGE_EX(__FUNCTION__, 0xff00ff00, (uint64_t)_currentRenderFrameIndex) @@ -63,12 +74,15 @@ void OculusDisplayPlugin::hmdPresent() { } blit(_compositeFramebuffer, _sceneFbo); + _sceneFbo->Commit(); { + _sceneLayer.SensorSampleTime = _currentPresentFrameInfo.sensorSampleTime; + _sceneLayer.RenderPose[ovrEyeType::ovrEye_Left] = ovrPoseFromGlm(_currentPresentFrameInfo.headPose); + _sceneLayer.RenderPose[ovrEyeType::ovrEye_Right] = ovrPoseFromGlm(_currentPresentFrameInfo.headPose); ovrLayerHeader* layers = &_sceneLayer.Header; ovrResult result = ovr_SubmitFrame(_session, _currentRenderFrameIndex, &_viewScaleDesc, &layers, 1); if (!OVR_SUCCESS(result)) { logWarning("Failed to present"); } } - _sceneFbo->Commit(); } diff --git a/plugins/oculus/src/OculusDisplayPlugin.h b/plugins/oculus/src/OculusDisplayPlugin.h index 9b6b922f69..e7d7791e7f 100644 --- a/plugins/oculus/src/OculusDisplayPlugin.h +++ b/plugins/oculus/src/OculusDisplayPlugin.h @@ -22,12 +22,13 @@ public: float getTargetFrameRate() override { return TARGET_RATE_Oculus; } protected: + bool internalActivate() override; void hmdPresent() override; // FIXME update with Oculus API call once it's available in the SDK bool isHmdMounted() const override { return true; } void customizeContext() override; void uncustomizeContext() override; - void updateFrameData() override; + void cycleDebugOutput() override; private: static const QString NAME; diff --git a/plugins/oculus/src/OculusHelpers.cpp b/plugins/oculus/src/OculusHelpers.cpp index 98dfa43fa2..c9e702ecd0 100644 --- a/plugins/oculus/src/OculusHelpers.cpp +++ b/plugins/oculus/src/OculusHelpers.cpp @@ -116,7 +116,8 @@ SwapFramebufferWrapper::~SwapFramebufferWrapper() { } void SwapFramebufferWrapper::Commit() { - ovr_CommitTextureSwapChain(_session, color); + auto result = ovr_CommitTextureSwapChain(_session, color); + Q_ASSERT(OVR_SUCCESS(result)); } void SwapFramebufferWrapper::Resize(const uvec2 & size) { diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp index 396f55b932..7b9dcc0b7d 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp @@ -35,10 +35,14 @@ void OculusLegacyDisplayPlugin::resetSensors() { ovrHmd_RecenterPose(_hmd); } -void OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) { +void OculusLegacyDisplayPlugin::beginFrameRender(uint32_t frameIndex) { + FrameInfo frame; + frame.predictedDisplayTime = frame.sensorSampleTime = ovr_GetTimeInSeconds(); + _trackingState = ovrHmd_GetTrackingState(_hmd, frame.predictedDisplayTime); + frame.headPose = toGlm(_trackingState.HeadPose.ThePose); + _currentRenderFrameInfo.set(frame); Lock lock(_mutex); - _trackingState = ovrHmd_GetTrackingState(_hmd, ovr_GetTimeInSeconds()); - _headPoseCache.set(toGlm(_trackingState.HeadPose.ThePose)); + _frameInfos[frameIndex] = frame; } bool OculusLegacyDisplayPlugin::isSupported() const { diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h index 187c0681e9..2710ab1335 100644 --- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h +++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h @@ -26,7 +26,7 @@ public: // Stereo specific methods virtual void resetSensors() override; - virtual void updateHeadPose(uint32_t frameIndex) override; + virtual void beginFrameRender(uint32_t frameIndex) override; virtual float getTargetFrameRate() override; diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index c4d8b252f0..f968ae440e 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -121,22 +121,23 @@ void OpenVrDisplayPlugin::resetSensors() { _sensorResetMat = glm::inverse(cancelOutRollAndPitch(m)); } -void OpenVrDisplayPlugin::updateHeadPose(uint32_t frameIndex) { +void OpenVrDisplayPlugin::beginFrameRender(uint32_t frameIndex) { - float displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float); - float frameDuration = 1.f / displayFrequency; - float vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float); + double displayFrequency = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_DisplayFrequency_Float); + double frameDuration = 1.f / displayFrequency; + double vsyncToPhotons = _system->GetFloatTrackedDeviceProperty(vr::k_unTrackedDeviceIndex_Hmd, vr::Prop_SecondsFromVsyncToPhotons_Float); + FrameInfo frame; #if THREADED_PRESENT // 3 frames of prediction + vsyncToPhotons = 44ms total - const float NUM_PREDICTION_FRAMES = 3.0f; - float predictedSecondsFromNow = NUM_PREDICTION_FRAMES * frameDuration + vsyncToPhotons; + const double NUM_PREDICTION_FRAMES = 3.0f; + frame.predictedDisplayTime = NUM_PREDICTION_FRAMES * frameDuration + vsyncToPhotons; #else - float predictedSecondsFromNow = frameDuration + vsyncToPhotons; + frame.predictedDisplayTime = frameDuration + vsyncToPhotons; #endif vr::TrackedDevicePose_t predictedTrackedDevicePose[vr::k_unMaxTrackedDeviceCount]; - _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, predictedSecondsFromNow, predictedTrackedDevicePose, vr::k_unMaxTrackedDeviceCount); + _system->GetDeviceToAbsoluteTrackingPose(vr::TrackingUniverseStanding, frame.predictedDisplayTime, predictedTrackedDevicePose, vr::k_unMaxTrackedDeviceCount); // copy and process predictedTrackedDevicePoses for (int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) { @@ -145,8 +146,11 @@ void OpenVrDisplayPlugin::updateHeadPose(uint32_t frameIndex) { _trackedDeviceLinearVelocities[i] = transformVectorFast(_sensorResetMat, toGlm(_trackedDevicePose[i].vVelocity)); _trackedDeviceAngularVelocities[i] = transformVectorFast(_sensorResetMat, toGlm(_trackedDevicePose[i].vAngularVelocity)); } + frame.headPose = _trackedDevicePoseMat4[0]; + _currentRenderFrameInfo.set(frame); - _headPoseCache.set(_trackedDevicePoseMat4[0]); + Lock lock(_mutex); + _frameInfos[frameIndex] = frame; } void OpenVrDisplayPlugin::hmdPresent() { diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h index 022af5b06d..0e1e7c5267 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.h +++ b/plugins/openvr/src/OpenVrDisplayPlugin.h @@ -27,7 +27,7 @@ public: // Stereo specific methods virtual void resetSensors() override; - virtual void updateHeadPose(uint32_t frameIndex) override; + virtual void beginFrameRender(uint32_t frameIndex) override; protected: bool internalActivate() override; From 24acf7584a2f336d35d8b8a2316ee8957443d5db Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:10:14 -0700 Subject: [PATCH 20/66] don't respond to http other than /status --- ice-server/src/IceServer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index d7fba12f26..2d52f9fc82 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -313,7 +313,10 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b ? 1 : 0; connection->respond(HTTPConnection::StatusCode200, QByteArray::number(statusNumber)); + + return true; } } - return true; + + return false; } From 0ee1f039e9ba0dd52825e3fd3b2809aba8307cf6 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 30 Mar 2016 11:15:10 -0700 Subject: [PATCH 21/66] Telling like it is... --- libraries/render-utils/src/DeferredLightingEffect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index a0b8f0ae84..ac24b09c40 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -435,7 +435,7 @@ void DeferredLightingEffect::render(const render::RenderContextPointer& renderCo float expandedRadius = light->getMaximumRadius() * (1.0f + SCALE_EXPANSION); // TODO: We shouldn;t have to do that test and use a different volume geometry for when inside the vlight volume, // we should be able to draw thre same geometry use DepthClamp but for unknown reason it's s not working... - const float OVER_CONSERVATIVE_SCALE = 1.1; + const float OVER_CONSERVATIVE_SCALE = 1.1f; if ((eyeHalfPlaneDistance > -nearRadius) && (glm::distance(eyePoint, glm::vec3(light->getPosition())) < (expandedRadius * OVER_CONSERVATIVE_SCALE) + nearRadius)) { coneParam.w = 0.0f; From 1234514e8fcabacc85d89d8aa85bdddbb6008ff4 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 11:22:44 -0700 Subject: [PATCH 22/66] Correctly represent light fbo fmt --- libraries/gpu/src/gpu/GLBackendTexture.cpp | 11 ++++++----- libraries/gpu/src/gpu/Texture.cpp | 2 +- libraries/render-utils/src/FramebufferCache.cpp | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp index 09714b5542..3fc7906285 100755 --- a/libraries/gpu/src/gpu/GLBackendTexture.cpp +++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp @@ -225,6 +225,12 @@ public: } break; + case gpu::R11G11B10: + texel.format = GL_RGB; + // the type should be float + texel.internalFormat = GL_R11F_G11F_B10F; + break; + case gpu::DEPTH: texel.format = GL_DEPTH_COMPONENT; // It's depth component to load it texel.internalFormat = GL_DEPTH_COMPONENT; @@ -302,11 +308,6 @@ public: case gpu::SRGBA: texel.internalFormat = GL_SRGB; // standard 2.2 gamma correction color break; - case gpu::R11G11B10: { - // the type should be float - texel.internalFormat = GL_R11F_G11F_B10F; - break; - } default: qCDebug(gpulogging) << "Unknown combination of texel format"; } diff --git a/libraries/gpu/src/gpu/Texture.cpp b/libraries/gpu/src/gpu/Texture.cpp index df93cd76a5..af740ddb65 100755 --- a/libraries/gpu/src/gpu/Texture.cpp +++ b/libraries/gpu/src/gpu/Texture.cpp @@ -285,7 +285,7 @@ Texture::Size Texture::resize(Type type, const Element& texelFormat, uint16 widt } // Here the Texture has been fully defined from the gpu point of view (size and format) - _defined = true; + _defined = true; } else { _stamp++; } diff --git a/libraries/render-utils/src/FramebufferCache.cpp b/libraries/render-utils/src/FramebufferCache.cpp index 7948dfcefe..22bfbfd869 100644 --- a/libraries/render-utils/src/FramebufferCache.cpp +++ b/libraries/render-utils/src/FramebufferCache.cpp @@ -97,7 +97,7 @@ void FramebufferCache::createPrimaryFramebuffer() { // FIXME: Decide on the proper one, let s stick to R11G11B10 for now //_lightingTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element::COLOR_RGBA_32, width, height, defaultSampler)); - _lightingTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::VEC3, gpu::NUINT8, gpu::R11G11B10), width, height, defaultSampler)); + _lightingTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::R11G11B10), width, height, defaultSampler)); //_lightingTexture = gpu::TexturePointer(gpu::Texture::create2D(gpu::Element(gpu::VEC4, gpu::HALF, gpu::RGBA), width, height, defaultSampler)); _lightingFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create()); _lightingFramebuffer->setRenderBuffer(0, _lightingTexture); From 1771875186873097789cbabdbd376b6925ae974d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:31:46 -0700 Subject: [PATCH 23/66] use one QNetworkAccessManager for the ice-server --- ice-server/src/IceServer.cpp | 9 +++++---- ice-server/src/IceServer.h | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 2d52f9fc82..ac5952ce43 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -33,7 +33,8 @@ IceServer::IceServer(int argc, char* argv[]) : _id(QUuid::createUuid()), _serverSocket(), _activePeers(), - _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this) + _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this), + _networkAccessManager(this) { // start the ice-server socket qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT; @@ -201,8 +202,8 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla void IceServer::requestDomainPublicKey(const QUuid& domainID) { // send a request to the metaverse API for the public key for this domain - QNetworkAccessManager* manager = new QNetworkAccessManager { this }; - connect(manager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished); + + connect(&_networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished); QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL }; QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID)); @@ -213,7 +214,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) { qDebug() << "Requesting public key for domain with ID" << domainID; - manager->get(publicKeyRequest); + _networkAccessManager.get(publicKeyRequest); } void IceServer::publicKeyReplyFinished(QNetworkReply* reply) { diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h index 6cc33fd8fc..2f9ee9c727 100644 --- a/ice-server/src/IceServer.h +++ b/ice-server/src/IceServer.h @@ -54,6 +54,8 @@ private: HTTPManager _httpManager; + QNetworkAccessManager _networkAccessManager; + using RSAUniquePtr = std::unique_ptr>; using DomainPublicKeyHash = std::unordered_map; DomainPublicKeyHash _domainPublicKeys; From 92e9e6a3fa35879cd7282920d4a7f6f0f89ef70a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:35:41 -0700 Subject: [PATCH 24/66] use the NetworkAccessManager to get a single QNetworkAccessManager --- ice-server/src/IceServer.cpp | 10 +++++----- ice-server/src/IceServer.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index ac5952ce43..7bd8306e9b 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -33,8 +34,7 @@ IceServer::IceServer(int argc, char* argv[]) : _id(QUuid::createUuid()), _serverSocket(), _activePeers(), - _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this), - _networkAccessManager(this) + _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this) { // start the ice-server socket qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT; @@ -202,8 +202,8 @@ bool IceServer::isVerifiedHeartbeat(const QUuid& domainID, const QByteArray& pla void IceServer::requestDomainPublicKey(const QUuid& domainID) { // send a request to the metaverse API for the public key for this domain - - connect(&_networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished); + auto& networkAccessManager = NetworkAccessManager::getInstance(); + connect(&networkAccessManager, &QNetworkAccessManager::finished, this, &IceServer::publicKeyReplyFinished); QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL }; QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID)); @@ -214,7 +214,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) { qDebug() << "Requesting public key for domain with ID" << domainID; - _networkAccessManager.get(publicKeyRequest); + networkAccessManager.get(publicKeyRequest); } void IceServer::publicKeyReplyFinished(QNetworkReply* reply) { diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h index 2f9ee9c727..6cc33fd8fc 100644 --- a/ice-server/src/IceServer.h +++ b/ice-server/src/IceServer.h @@ -54,8 +54,6 @@ private: HTTPManager _httpManager; - QNetworkAccessManager _networkAccessManager; - using RSAUniquePtr = std::unique_ptr>; using DomainPublicKeyHash = std::unordered_map; DomainPublicKeyHash _domainPublicKeys; From e5adfc40b2a8f02354a851ea49fad316453fd339 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:42:41 -0700 Subject: [PATCH 25/66] use the inactivity timer for ice-server lockup check --- ice-server/src/IceServer.cpp | 8 ++++---- ice-server/src/IceServer.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 7bd8306e9b..128c2b27b0 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -69,8 +69,6 @@ bool IceServer::packetVersionMatch(const udt::Packet& packet) { void IceServer::processPacket(std::unique_ptr packet) { - _lastPacketTimestamp = QDateTime::currentMSecsSinceEpoch(); - auto nlPacket = NLPacket::fromBase(std::move(packet)); // make sure that this packet at least looks like something we can read @@ -282,6 +280,8 @@ void IceServer::sendPeerInformationPacket(const NetworkPeer& peer, const HifiSoc void IceServer::clearInactivePeers() { NetworkPeerHash::iterator peerItem = _activePeers.begin(); + _lastInactiveCheckTimestamp = QDateTime::currentMSecsSinceEpoch(); + while (peerItem != _activePeers.end()) { SharedNetworkPeer peer = peerItem.value(); @@ -310,8 +310,8 @@ bool IceServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, b const quint64 MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET = 10 * 1000; - int statusNumber = (QDateTime::currentMSecsSinceEpoch() - _lastPacketTimestamp > MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET) - ? 1 : 0; + auto sinceLastInactiveCheck = QDateTime::currentMSecsSinceEpoch() - _lastInactiveCheckTimestamp; + int statusNumber = (sinceLastInactiveCheck > MAX_PACKET_GAP_MS_FOR_STUCK_SOCKET) ? 1 : 0; connection->respond(HTTPConnection::StatusCode200, QByteArray::number(statusNumber)); diff --git a/ice-server/src/IceServer.h b/ice-server/src/IceServer.h index 6cc33fd8fc..7d1d05324c 100644 --- a/ice-server/src/IceServer.h +++ b/ice-server/src/IceServer.h @@ -58,7 +58,7 @@ private: using DomainPublicKeyHash = std::unordered_map; DomainPublicKeyHash _domainPublicKeys; - quint64 _lastPacketTimestamp; + quint64 _lastInactiveCheckTimestamp; }; #endif // hifi_IceServer_h From 4210bc178e1302275a75fd2a7c8f6814e01facb3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:44:55 -0700 Subject: [PATCH 26/66] default the inactive timestamp for healthy startup --- ice-server/src/IceServer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 128c2b27b0..9d1bb58ddf 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -34,7 +34,8 @@ IceServer::IceServer(int argc, char* argv[]) : _id(QUuid::createUuid()), _serverSocket(), _activePeers(), - _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this) + _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this), + _lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch()) { // start the ice-server socket qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT; From 6bdedeb5cec21b600a88eac5d32abe3cf2fc9373 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 11:59:49 -0700 Subject: [PATCH 27/66] change packaging parameters for Sandbox/Interface --- cmake/macros/GenerateInstallers.cmake | 4 ++-- cmake/macros/SetPackagingParameters.cmake | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake index b4744aa172..8d1eca84d7 100644 --- a/cmake/macros/GenerateInstallers.cmake +++ b/cmake/macros/GenerateInstallers.cmake @@ -85,8 +85,8 @@ macro(GENERATE_INSTALLERS) set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") - cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Client") - cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Server") + cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "High Fidelity Interface") + cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "High Fidelity Sandbox") include(CPack) endmacro() diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 92e3273f67..1886ca36ac 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -53,7 +53,7 @@ macro(SET_PACKAGING_PARAMETERS) set(CONSOLE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) set(INTERFACE_INSTALL_DIR ${DMG_SUBFOLDER_NAME}) - set(CONSOLE_EXEC_NAME "Server Console.app") + set(CONSOLE_EXEC_NAME "Sandbox.app") set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}") set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents") @@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns") else () if (WIN32) - set(CONSOLE_INSTALL_DIR "server-console") + set(CONSOLE_INSTALL_DIR "sandbox") else () set(CONSOLE_INSTALL_DIR ".") endif () @@ -77,18 +77,18 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_EXEC_PREFIX "interface") set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico") - set(CONSOLE_EXEC_NAME "server-console.exe") + set(CONSOLE_EXEC_NAME "sandbox.exe") set(DS_EXEC_NAME "domain-server.exe") set(AC_EXEC_NAME "assignment-client.exe") # shortcut names if (PRODUCTION_BUILD) - set(INTERFACE_SHORTCUT_NAME "High Fidelity") - set(CONSOLE_SHORTCUT_NAME "Server Console") + set(INTERFACE_SHORTCUT_NAME "Interface") + set(CONSOLE_SHORTCUT_NAME "Sandbox") else () - set(INTERFACE_SHORTCUT_NAME "High Fidelity - ${BUILD_VERSION}") - set(CONSOLE_SHORTCUT_NAME "Server Console - ${BUILD_VERSION}") + set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}") + set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}") endif () # check if we need to find signtool if (PRODUCTION_BUILD OR PR_BUILD) From 724c95fbd6bbd363f23ee6871bc314ea28e989a5 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:05:17 -0700 Subject: [PATCH 28/66] leave executable name for server-console --- cmake/macros/SetPackagingParameters.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 1886ca36ac..cdbddf84e5 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -77,7 +77,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_EXEC_PREFIX "interface") set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.ico") - set(CONSOLE_EXEC_NAME "sandbox.exe") + set(CONSOLE_EXEC_NAME "server-console.exe") set(DS_EXEC_NAME "domain-server.exe") set(AC_EXEC_NAME "assignment-client.exe") From 238f9e9298cc6bf7c9c7c2d532f1208752479c17 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:07:40 -0700 Subject: [PATCH 29/66] remove the Stack Manager migration section --- server-console/src/splash.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server-console/src/splash.html b/server-console/src/splash.html index 30868ebb6f..b9947bcbaa 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -23,7 +23,7 @@ High Fidelity is now installed and your Home domain is ready for you to explore.

-You can make your home yours by uploading your own models and scripts, and adding items from the Market. +You can make your home yours by uploading your own models and scripts.

@@ -67,12 +67,6 @@ You can make your home yours by uploading your own models and scripts, and addin -
-

-

Your existing Stack Manager content is safe.

- Server Console comes with demo content but does not overwrite your data. See our guide to importing content previously managed with Stack Manager. -

-
From 2ea0309955ea070373fc9cb0589dca5316eeb9d6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:08:56 -0700 Subject: [PATCH 30/66] change setup options and prompts to close running applications --- cmake/templates/NSIS.template.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index ca26be6ab0..c0f84a6b7f 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -414,7 +414,7 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity Server Console after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" ${Else} ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install" ${EndIf} @@ -465,10 +465,10 @@ Function ReadPostInstallOptions ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ; check if the user asked for a desktop shortcut to Server Console + ; check if the user asked for a desktop shortcut to Sandbox ${NSD_GetState} $DesktopServerCheckbox $DesktopServerState - ; check if the user asked to have Server Console launched every startup + ; check if the user asked to have Sandbox launched every startup ${NSD_GetState} $ServerStartupCheckbox $ServerStartupState ${EndIf} @@ -494,7 +494,7 @@ Function HandlePostInstallOptions ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ; check if the user asked for a desktop shortcut to Server Console + ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES @@ -502,7 +502,7 @@ Function HandlePostInstallOptions !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO ${EndIf} - ; check if the user asked to have Server Console launched every startup + ; check if the user asked to have Sandbox launched every startup ${If} $ServerStartupState == ${BST_CHECKED} ; in case we added a shortcut in the global context, pull that now SetShellVarContext all @@ -724,8 +724,8 @@ SectionEnd !macroend !macro CheckForRunningApplications action prompter - !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity client" ${action} ${prompter} - !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "Server Console" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter} !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter} !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter} !macroend From bbbfa7227fcc0c908f4d76ace87a1300e0b5393a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:41:13 -0700 Subject: [PATCH 31/66] changes to electron app for Sandbox rename --- server-console/.gitignore | 1 + server-console/packager.js | 6 +++--- server-console/src/main.js | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/server-console/.gitignore b/server-console/.gitignore index 1624823e80..b293c73eb5 100644 --- a/server-console/.gitignore +++ b/server-console/.gitignore @@ -1,5 +1,6 @@ Server\ Console-*/ server-console-*/ +Sandbox-*/ electron-packager/ npm-debug.log logs/ diff --git a/server-console/packager.js b/server-console/packager.js index bf8ddd68d4..1f90a300a3 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -23,12 +23,12 @@ var options = { arch: "x64", platform: platform, icon: "resources/" + iconName, - ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" + ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" } const EXEC_NAME = "server-console"; -const SHORT_NAME = "Server Console"; -const FULL_NAME = "High Fidelity Server Console"; +const SHORT_NAME = "Sandbox"; +const FULL_NAME = "High Fidelity Sandbox"; // setup per OS options if (osType == "Darwin") { diff --git a/server-console/src/main.js b/server-console/src/main.js index 18cffdb81b..b36d798a30 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -111,8 +111,8 @@ function shutdown() { dialog.showMessageBox({ type: 'question', buttons: ['Yes', 'No'], - title: 'Stopping Server Console', - message: 'Quitting will stop your Server Console and your Home domain will no longer be running.\nDo you wish to continue?' + title: 'Stopping High Fidelity Sandbox', + message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?' }, shutdownCallback); } else { shutdownCallback(0); @@ -212,7 +212,7 @@ var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) }); if (shouldQuit) { - console.warn("Another instance of the Server Console is already running - this instance will quit."); + console.warn("Another instance of the Sandbox is already running - this instance will quit."); app.quit(); return; } @@ -237,7 +237,7 @@ function binaryMissingMessage(displayName, executableName, required) { var message = "The " + displayName + " executable was not found.\n"; if (required) { - message += "It is required for the Server Console to run.\n\n"; + message += "It is required for the High Fidelity Sandbox to run.\n\n"; } else { message += "\n"; } @@ -250,7 +250,7 @@ function binaryMissingMessage(displayName, executableName, required) { message += paths.join("\n"); } else { message += "It is expected to be found beside this executable.\n"; - message += "You may need to re-install the Server Console."; + message += "You may need to re-install the High Fidelity Sandbox."; } return message; @@ -770,7 +770,7 @@ app.on('ready', function() { // Create tray icon tray = new Tray(trayIcons[ProcessGroupStates.STOPPED]); - tray.setToolTip('High Fidelity Server Console'); + tray.setToolTip('High Fidelity Sandbox'); tray.on('click', function() { tray.popUpContextMenu(tray.menu); From d80f612c6206e35ed8652a98e6da4de551124e12 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:44:10 -0700 Subject: [PATCH 32/66] continue to ignore old server console output directory --- server-console/packager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/packager.js b/server-console/packager.js index 1f90a300a3..657098d2f4 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -23,7 +23,7 @@ var options = { arch: "x64", platform: platform, icon: "resources/" + iconName, - ignore: "logs|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" + ignore: "logs|(S|s)erver(\\s|-)(C|c)onsole-\\S+|(S|s)andbox-\\S+|electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore" } const EXEC_NAME = "server-console"; From 2d1c4243f5af3e77939c7db0d5a50f0083c40de1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:47:18 -0700 Subject: [PATCH 33/66] prepend desktop shortcuts with High Fidelity --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index c0f84a6b7f..ba2ffc36a9 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -496,7 +496,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES ${Else} !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO From 4940639e11ceaf006f5aa4af3769db2bca162946 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:48:11 -0700 Subject: [PATCH 34/66] clear old desktop shortcuts from before rename --- cmake/templates/NSIS.template.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index ba2ffc36a9..8c41b434f4 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -589,6 +589,10 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\xinput1_3.dll" + ; Delete old desktop shortcuts before they were renamed + Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From 05163367e16471b7e98029843a1f19567930f3ae Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:49:55 -0700 Subject: [PATCH 35/66] delete old start menu items from before rename --- cmake/templates/NSIS.template.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8c41b434f4..68ce78b560 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -593,6 +593,10 @@ Section "-Core installation" Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + ; Delete old startmenu shortcuts before rename + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From a200e56f924d14714f3841214ba52c9654c48888 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:52:11 -0700 Subject: [PATCH 36/66] remove old startup menu item for Server Console --- cmake/templates/NSIS.template.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 68ce78b560..f268feab37 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -589,14 +589,17 @@ Section "-Core installation" Delete "$INSTDIR\version" Delete "$INSTDIR\xinput1_3.dll" - ; Delete old desktop shortcuts before they were renamed + ; Delete old desktop shortcuts before they were renamed during Sandbox rename Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" - ; Delete old startmenu shortcuts before rename + ; Delete old Start Menu shortcuts before Sandbox rename Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + ; Delete old startup item for Server Console before Sandbox rename + Delete "$SMSTARTUP\Server Console.lnk" + ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" From 8e9b337701957c967ea070ccf517bb0530d5aec2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 12:56:09 -0700 Subject: [PATCH 37/66] replace the server console logo with a sandbox logo --- .../src/images/console-hf-logo-2x.png | Bin 12108 -> 12215 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server-console/src/images/console-hf-logo-2x.png b/server-console/src/images/console-hf-logo-2x.png index 4c0afd67779133af27925d7c0db7cf98306606b0..420fb18fdeba2ccfb195f5a9955ace35db96f574 100644 GIT binary patch delta 11449 zcmZ{KRb13v)HTx0&>e%6G$LIxq=F(!3_U}NLwEWohLG+M1VmAk8bG>hKvFE}!0ainI1P+cc?-O-Z1HYNA4@9~26VvFCl!<7H-x#UVdA;yb-chD> zUWwYQkjes0JPAx;at(TC zd@9gkcyLa^cYR^w_OhkTB+Ju&xcSwvr=Gvw_|^GgJP1MzfRV*)!K=7nBnU!GBK&`r zXwAau+r%$lzC_mlvEuaZ7Q{H=n9)vJI}>0$P-}1<(@RtR$wU}u*Ft2A-L?j_q9z-4 zd-Zm1dUtb_20{#GN$kX&@ZEBq2GBu4uY{}*l`t8oAs8Nf!07zPNGC_Q5>6A*2>?=` z>J8ZXZ}-w>((gT$%;dAwwRlb+$mtLqTW>MXCIh(Y9|gZ61|yT&`+pQ$`z{Ql=HUt* z38G2-5DSVF*r1xUcaZas_0)PYTkqEd;h-T77Zo>WLkanniPx#(LifJ zMmlgwQXi1hd_W^VDhCdP0P~-XMDA{lD?|aWc_{s<4E4`=<8(s>wT~JA|5*R$P7fgl z^PmJpN{u?#p_tGw^7A3PSp;x~1#z-Yu^`;TD6`j9o#hoKpy5zSx+!tXtSF6=7qyHq z{;nI+kH_CQ%>JkPHQrTgt#Wzv}aVI7Uri*_}9ZnqEMNy-wcgJ|Y}u z)?xH5NrA~~Q#S4RjZ!0o7>vX>GOv7y>qF?YhKvgA_k&ZrM9dR~KIC6Rz&9r+(PYe( zAD(ak2tfk=@=sccsQ;i?6V#UOUKc}&(6FuRV+>IxVD*6N6*qI%Po0vOzZ_^X{z~gX zwMt%K=M+UtFJbu~yreXou`ti(8d;lc%Ww1wC ze77thH{y;jrPh^|9MZ;}(h14eV2mur8^m&W;CJ8c+8l2m2Lng5%5tV3!n9T{RK{#X zkRXUQOyB$kR5wI~Lt;||H4YZs0m?I3ajo2ZR$5WmI2j=cQoYU-qzcFQr@Qb+#qCwr zE4UbC>S~W9nO=_TCQDcHpf1s|>o~?da6cCy$`{NPp#Wm{Rk&}>lk8U1GiYm*pV0VHUysQtGe{!c>-V+n@~b8vynNE?RQ{#;Vl#bWBA zO9m*2w8`2td!PGbQ~OT)^`W?sIPb?Eg0gA(HI{{C z5=_G0;^9Fa2tu4(-u^E&MOKz6r%fS7NK}8El9k)N2Ip*r6C?f{Bb8tx9Wsxwi6sFe zLEIYO7s4U{(i?4T#7no(Shn4=X}6Ecc2~katc`=ML9{2qXI_np{74YQAk(0c7>r+^ zvE<60DtU1sKpaZt6_^{O0Ls~fA>?>A0%B*o>ZtlXA;e(y1Of(poThU=S)R2qvEG6M z&Wc%@>D~dDCxH`D)asj`cW?7R81-U5vC}?94S1=^$+@7t%=n$Fs(y=dicb*(J|94J z?46SPKPLtw`;yxs5hFFn7;k#%kUSAVg@P(Tz3vk?Bvzt&*h~9@&B^oZn!^9tU1(@K zgtv`E+Psy|Y42DEC0+B`z}%J{ImF4{z1@Oxu6g_M4k7o@i2h(htVk%!l+Lz?PI ze}+)Pz4s5*O$BaG)lTpp&=7C z_|;V@$HT+id$EO#xqU|(TVjvZkiM<8$!IBKDh*shh?aP2YCnt_Dp~5KKN2JcBSFm6 z(BdrP-u0^_TPLAeBKjLOLxJ0SC}-|?^dI@_T2a2H$^!e=y&eNyy1mo5hD-^qa97 zF&G)G=c(@Aa|DM|3Y4P1yf`6(9l~O}`+!SX{H04rIp()mb)3kQr8uS9e@YRDDyb(! zXt|A#!k5tGn%CL3aos@azCG9780RKT=5F}pVZYb!iI;*xxVwQpuL68bSVTtZA^P?A~kQ8G4*A z?WGo|T}3T0J`zxvh8o{}aaZ3Yh3OYfPe z!kE)Zuwo6ibE+0yI@a^=J*kgNK*R4w$OH`(M(5NJay^e4c;ihCB7220A(AfYcA-RW zq{x?P%P2*xun}%D-e3GFHtc7s8Qs(%y>yF6|sY;VQ9 z5dRw$G~%~8mX3`v?QZG6w~^yV_5|?#T|YO~wLpw%YoedOBZf8?>V){G!jqj#LC}Xd zhFeK&&!R^JoTt3Ry>^0csJ77Tj{5HS85Xs?0(s-(#YvpWm;Ev6v+;F=%WP4r zTkjQQ?`u$PF3dgiH6{iliN7`s-nu%4H4#;0Y(g|9<3Zo!-bqo`8ovX0d^^xw^X$xm zhxY{ztIs@#9zOATBt@whb8tDNT~SoA4|ykU$;xl*HYsFgE*F>{TX4AG$+n~>Fc2#-tT4DQmy^49VZKXYbJX&( z$07OjSnEL>E^od}nw<#XL@2+S&-|m1Afd~qG`%3`O8-22zBR_P#fW#Y$Sr)IVTMqlSK}Y*PsDS)WPhO`oo#EO($tyKG>|NTd}q&)^13(aL|^ms7OvvyHj$ z0S;vYv6o|ue*68H{`wmC*xq%kn>X5{`)3kOy?&d93#$SK=1mQ$qE0&ju9z6}AyVge z#8c)Ed?M3nj!HrNva2e+_+m#l15aq-?{grxq zVzG1@_&V&==9mRgoPq~Mh0Wg#aYnKg9#KRExh^w1bx5AR?cDIwcXA1#aC>42g03ld zDj)?qd*h0YU5KaK!p+mz_g2KH6c~Z3p1-H)STo~yKZ%8yU9;LFP_(Om2gUC@tl9N+ zXIv$V-(Z5MM-Yr=K_0S>>(hk(=*fOqw*3W*=$YD&E(w4WQ0K4=J>*;!D6hYoJC6X4 z9_)8mlIMuvQWn^`|H~nQn7*7@EgXy%YCRgkSn28*>>Hf^oXrlAAPV$+OY!VP3&%`5 zV2_+CqrIOEVPC3Py=~g{_Qt6vj!bKY;ii7kM3mmQ(B{C0m8$wjJ8llfik${ZLCis! zkbh?UI0X<{D|$~>(gQbN_@fBDrF(u}(40qNsp~#^@n|WFq1OHbqPO}9%r3m9ddFAD zI>Bvl1kAEcGCXo9yqmNWkcRl!Se@2BBe=@tyQyG&I!BLkl?oy^&WwG-UmiCVub^1; zsx>|l4XmB(idS25A}}H+)5C&J8vb8Z^Qud0V1Sa@7l|bXCl?Pz&A?nE;nii?icf4Q z!$Q1gPf1F5@!3|H&406A3{NPXMs6*di++DsZ+%Lt=1Bfz{|8my;dJ@yfB4GdGMJ9; zgJ9>MGfbrg?onDSu9I(=oOw4Gsq?pUj|mg^E;+qzha*d2GY`Fgao$%U^h=(= zjTt7L*M12ZYK=nbDNXPeP3Bhf(?zPci*7fs*hc_?u>`d|8MX4Lj~Z`x+!Uqd zEeu>7D%(kOl*E<3j!;+yoJ?>K_F6;&+a_*%uL3^clEipVcD`=&L4Pd1sd!pzxy=G5 z!@HL#cv{lG9Nv@hF7VkIR1qAL&rT^)Ai?zSnV*kb%Lhbt9`;w~i>28<8T{VHR~+;S zbQ!s3Q>tWc=7tz@b)WNwALxg$vyC+$hB~7fe6~OAY=6pf7xAAHEKr@`TP`8sz~ZQ< zNk&1o4c&T4zs9%9eD~de2Etkgb9Y|#2!g2%@tfkcI_anQr{Swg)XQ=?4s%`7Y;ldi zS_tQl-0qs#F87;+Lqbi%Xl_)%=AXBZOo)_m92V})S|+|;y`1M}EJE)j{H@=aeXH75 zj4akC=-UUJBD{m8ef#&~Ajv}xz?LR0TURAcl<5^8?ADb%p+h3N7s)Hg04`NsoJuR^JX;$4PCxw!Svtzx$v+-N&hx&_%)m5Z9M3tQnl; z*~q^&5KV4UN6RTdW<*v+sVf&&WcQy?KADd3ewkcvJ(8ibNzV_8_kN&97kX^}Jou*7 zutrS&%SIfdsOkY5+gqm;sknb31rojko8HeOp0SV5vwGJSfTW6X{*l0()!#lNOAi=IN?b*rkITdfG_#daS-T#bosRv`IaQ10h8W z;zei?L#dbBHb)S&oJOw0+h?iKBRv|t^3CwMuXg_v*IfO+NulR+@s*Ck(YSpL2FWG$U=9IHv*w{G8 zy&9K+2fMt#s1heraF#3&Xdkj|yb+rF%A-PR)Zgb_x|FqZ-aN;2xsWYiFHx3j97xo3Ds8iz>S)XIhRyakD2F7-LJ0YkJuE5aS(DFQgTo3o;c))ME zVx;MC`;qt5Qd~8A;!mqL?iup$6E?0oNi9r25hSf5vtwz2RUnk}RQ^CKjpP*@W3KIS zd`lVc@?#7^ibzArB0n~;S6+FGXg-fJ3Y&P0{gm<1q;5HuwZnVnq)I>PTfjMD+|DG$ z*|F~wW!Nz_X+mC@2tj@+7LC=?-kj-F>`$}8eGvTs9URkAEPPzs=b7dWuLhBo7$?G9 zou*@80SO1i+T(z1L`XS8)qFBA- zZi5d3yI&E$e`MAs=k}dGSm>oK^O?MUklEhv`eDH$lrysVmUhK9?%>|;>|>cVDW)7e zX5Cbas0w-eH7+^y(o)FTC%Deq9Q_b|@h^>_jD#fMqy>fV$04@>vuiNKEkQ3%HB-oB z7io!4HaMMe-StKB z{rWT#8%Ot|vw$2E#vg3MW&xxR33|07Biz3aKRqt&IECC}7^ z+*~H_EMQhNu{uo%#V+V1-5OvL5kVBYn%bKWHB%}(o@xYb&``5}@w0d`l{L`W^3IDB z*#Gc)bm~ASBRWaiF=TUd`O>Gs94hKT2fcO3ocmVX9suSlQwDWFV)2%!Ld4~I{3>NA z!`A#6;F#;3A-{8GCQqNa!TLlKP?Em&_hU~#&99jkQi%v>y>pAd&joI3ioLPKr41gL z#T_y=-21|p>cx+EQFDS+!}4$|u_haU=^wa4M|jl&Hi4&aFXo8;+DE33K73R9wNK;@ z^@U!Vv$gv7=Ig>g?7Nssy()4oI|IONf;G~{$N6B*G2d-&6HN|UIe5q>6?rpWOdbC} zO_&mG%G&~ShU{}W5#L`eZ~6LTR=BAv6uyinawanp%6)kiqNneRi^#*zAO_BfpJxWX z#1iy+Z4MZ6^E+*4?Jzey{T<(aaa~{ipgfOUyX~8~(e2e;7k_#GDy`~WEBftbq4aq7 zOJ7%A1h%5qL${pMqwp<$2Co2W(#XR^t-U`WIpkW&L;sE9a@J0uH|nIQ7^q)`R@=-F zt%~Zq;%>Hv9F;8HSAOhL0t9veR@?Yh1jb2JFBB6Pph$YzF0oBg+?|m$pibCB-xY06vbmeJwi6Hw6XQYk*?>8Z z*w<)a5BnwL7OrI8-B zhJT=9h31kpF~jfZ1qVt52B1oj=X6jRxvQtcY3-fiO{~(FX_yJB%NskZ86xiiyx_j_ zqIujDudb+yfmeS!jqK)fB+zEXzv+i@*qCFd0U1d(yX=p>ykBt# zJiObLDNV0b0nPGdT+9f2g*Th}WJlw+-L!)3?SzNEGb){OH__hcT>x_Am})P#Eo=Fq za!FP6Qe3!pW|m|52`$zHH<3u?e|-S zT%+Z~O6Z-^!*_Ku)Q5DHq~#c(CvZTJYxhOdma2#x@IaFz68yq=*%+SG--CC8Fw&D& zXZU1RJ#fkEueQqe{QWttlceI5o^5mKuD$S0KE6>NK?bh?0}0Vj4roc(Z1h1+_h4&@ z%Qd8R)u~ENO&J-ZlggfaoV3q?Z5>=-1s~uyHObAvXcY&d+7EtlUzYaY7ZgFsqE5y` zuA^oE;+7iNCwzb79|O|FRJGCMT1#Y|lSG#~k^KSp2kqpt{7FW-c;A=<8OMID8EZWX{T@59r)eTdDoAIC=AK5G zM++B7(ZRZ1+=>WQaA2u~a4#!$j3jT7L;LYU^UF1lLC@xOs+W5|b$hFHeKGl~%B`+I z+DPrqhGdU~k&<7=`ovOzP>+h_!B#4Y8Cf1{+m_O?Q8A;q3mw)HaFlzNOxhtn$H z@2}V9>9m|TJ};_J$U{!@@4Kg~Y^4Ck6H`F!9l<}JYX{nM z^!J!N_^R30`M2Yedojn5L2MEIg{(F}`(;9^9Nu5Ol8zQm$9~^Snp(^FaUt$IS^f#k zM3!E$m_9bSedK$Glvn$6>E-l*Zr|;!~+)iMeuZ+B`?fmazcP>;FAK;}fwk7+L&iNaDav z{IcsykRLv!Uq0;352i=Rd%ctsJXzW7vaKdzYHqNrLBWi~4rVcuCnubrvcvDBKJE+k zA=rJbs2Z0zh@Eojz3T=q-BDB6xnSmQ5atco@oiB->Rntv?m*`+T(OAH4ZlSD=Cn~} zkDdT(zyySQ$%2mEIhPeAKTR*>W?29Z2@7x_S9qLYZYu66K8s6DOcH#dh0r@itbrw zTU$~+4P;fD4przXwa~d3A+qdSI$O6L3Hnth!bDmMS=#ybkpl2`+E?Xko{C<6ZIQUNSS4V5mM*xqB z;%tI033%8|(<+E^-mRJ1BZ~=xQ*3L=_;$(2Sm~4)(yv|OmtLG9V>c5Lvf>efc~)@u zo|^@oXMTOr{4lLeLlDH)+}xc|!R)gpGP>j?`9n*gOwc(9YV^Xb;k^x8ie<77XpALB zI8sh_vYx`v!E>uTJ-5N3hrY?a3sBzCN{ z_`h6z2{VyR3TCIBBOj1Zm4WzO;nQFKCIp#~`=bcTeVv`^kY)Hbb^l(WnksLrpXSqU z6u!QUR~s95zd;<65`!N;kFqjXeH2WP;q~3{ndrK8)@?5}xEg3zk$M(WT=nmx13+3)QQ#Ylq(ql3AE3t|q+}2O| znx??MDQP96++-s#W$EkCiKVJ;U8x}#Y|OA+49?zmYY>q6H+#A8^cA2s*Mg?Ip#lUQn8u=sj9iEg;)qW+(yzf0MrR!E%U|_VSxz=w}(+ z<{&($5+^JIk0RxB!@V#21j0rWIyN7XC3ca8g_YoKWc_hVG|4k!Y@6}$y1bI>UX#Bt zI9z)iF)XkW*Rx9F;P?vjLz6`N{bQ&IAr^LmVDFj0qC|Mhks!HltMeK|xj6_Tc`56S zbKI`0N-1#EP>GH#;0>8GrWptl-qcOC^eNSq_vWu5@xC4*=u0*@^4OxaBUC^Su?UP<%Ae8-{{$5_I7}+`C&Ly4MMJR8-JQJzVk?7hN2uafv zfld>q+g0erb(4-S`Q=Gty|0fVKV#1oV(?$;XixnPvYL6TEHS44y{cA(k2bbj=TD6p zT%u4LN+IO?tW_iLy3C?n1o{@*R+lNC=v;P4Mt4yl)i+|Kd%~~=-<(SOAy)X!WsS%Bvm+M3}&(Fk;T*&n>(4o7AiXt4;iD%zbsXWytXo0 zr$$>pi*rku)<_RZ5@0sv861Pzssq3=-Te5=GmX)-;=(U|ZO&jjvAMPmABlZycZGK2 zgm?NM#`(AFkkpHnaAG3Sje`c8+8+4VE_;X9r^ioS zA6rEyslj8Xl2N9#CqyyYm{7FH4~=`nlWh3;$_09rpu&U*2J8cOlw<^&#mJ4_g<hv{Ry>F!|St*;XJVqI2lwQJ`WN2FjD zU8m#s1o!ybx)Zh?B`uBh;V+I~UjcPGZrZZ}qYPX)ey!T7g2B2#S&G61KQ*t!yZiD1 zl4oq*7}cBbGOo>IC7BJLY~4}w&DiSXp3^YQnL;fPRz?TD^g!pB__7^%He|)ZWNekV z6`St)525g2n`lLH#(rg-Dfw6VreGvg+s}K(??q~G858@LZrD0Ee2wPnFxK5lTd(r- zTHwF%WP4SvQ8D2D>1@48<=@owlJFO>rJCE&XJHy2WQH;d*x|-qmf;}{XGUb zGH{}d!2{JG$7)rpZhq`Aj;qNJQxuhHhV{`ND!c#6KgXczg;Ho!r39W{)MNw z6+SSM=@y8IB%%6g63Pbnkd`ky-}wlrE!`oC?k|GiGk^|>d(UkX=G3Y*P#%ICRdw)z zi)xDKg!#1?7}fYs6LyZA>;egxF}v1+9jMCb4`1XupWz`^Y1uL*iewFsB(Ng)581Zt zat{vyS$>r2V}H*{2}|U0JdBmKjv&ioS?n9_3-s+DLl7id`{?3ERI2=Y*KL{iUxt;m z;K*RLZQ2E--8KB^|zTDKMJiQBezI}^M75W{iDJCQ-Pt3Vz>AeYUV)F2>eaf7Gay3=%Uf2@VtJuydX(=^O)8 zB91Ai%LZLmI?v=u|JKTWWVu*fqxkqM%!1P9bhcJpQ!d|Fi!*cz?x4TA%yODmPXmdL zc`*bctd{hMpQpyRdoV_0Cn`}MK$|fDBzyxy204$sZNYBexA}JVN%j(C8E5$uUCFw8 zw^0`R8*k9D#J7IWt%7QY-6b~X{X~HJFE+523l37SdJmJ)mxJ;ju)dgfmKQD`+Hf?# z7!21wv=j9eDI?kSeG&Uvg{PO7chcaq9;u|J)~quzG$gMYS1KL^`Xk@>#L89PeophV|5l;mNB{tvSd?^O%=e^=9Ra4 zeL^x{gu89eDK{+nkLco}+Wm#p8x359N4A<3NY#Ne3r1%G;s`HVy{MGhZz&d5F{a z;rtz~cFi4omtC@tZ;n|QcJ+~tFN0ZY zoZT=h4f>py?98Dl9u;2KRStX_Qile~f2{u}@M`j9r~R8`lw-V`9w~SER|7hqOU3iu z`92S9$rgDh#Nms9Hukkcf!)Y)0M$sc8X)d&6MmyvmRle#(}B#9SpR!0bXe= zdoBaxE@f63L3R#OwU_0WX^^0=)>hM-1uCR?4G!6V%AngPXQ=}qwM7J8iWsXsod};PxWY3MLR)eVhM6fT(vt)i4d_Kc%*$crP0ILlAcAP^;(U*UcfiRnu=0`H08Y#xqzvH`b zYL?D%O|rQFI9@5^HZ3N4mf~#1zhG!1{t9!ZppBuqGqD_S)tWjNVXW(lR@l9#pH>fa z=S#>Aa`K~9#K+5K)2L>D8F|GCoQ+WP0y(>;PtP4aMk{Bm^FE0z zz4f{b%Ha8|QPPs((OL2PI89#jmUKQ!to#|S4l$S=3F5Z9=p(puo`C+__5UuZrJ@?C j|3ukYR`zaj$#I@Xd_Z6h`?zs%aB!YzJXbG=z{36?DAp7Y delta 11294 zcmYkicTkhh_dTv4T_N;dLa(7oN0Cq!rAUVW35cLXARwU=>AiQUf&xMa0i+|nS3!gz zolq1aRY3Z0c)dTrneShBX7|~>=iKM)?#!LjU^ilmWg<#tAO@22_`Gp{_DuP4YA=yo z>RX~0cNM@gQVLqKn(7(~im5!rjH#zY?En9u*8dHfq3Aq$B5vIhYksV$ZsPNkkVn?Y z_@n7+2G~#3<3W()weT>F^NW%uEf#dX|6a2g8vRF<>pq)+dcarLnB%_=Ve?kHIgL#`dr2ZI!|~|`*Qceo86NW)g@W7qQ9_({0adw)?RL(A|#3`ePY_uS+e|;1V(K%U$M70Sp6-Myl0+6;K@bN=w4jGqr^a zAgh;v-$JXwKZP00-Sa1sCqbgP39u-PfeGOzEd{!WvfLI2rU-Xbyo5pymS|%-ksJ3SSU;_Od{t{d_3Zk5h(zV>B;!tG_z6fNX@4$Dcm9nz%<>5 z7RgGmC$D5SxgY-D{^DUjJaBizId9LECGSuWsBtI~?A(v?8`8SaPeAl^&xVB<+RS5#fDbmvCyEt|Go`^V$>xW*-mi(6pMY1tN z$dV6?D?^{hO|nxz@{$C+Ez4*P3B$?-qy>!RfzucyYeOki>#KNdnVSc1Etf#Iq;{jSGo+w~799Nmcy?sE)_n_4xVvfNiAF#~w<}8wQ%~S+x)mHLa zB4au$$hY^E#+Vh({D?o4*I$KqZ$$r_63rzN9m-eTG-d=rM899batdIWi0vSW_wZqt zKMQ zb^{_mLeAFtO|CY#>U)k6?DFQFNQ5pXLmU_eC>kK5V!SqlqXd=t9slkJz8ARw6Y<6l z@3_C|;^Rzdr<~)u$`={GAw)uFQMT7q&((q{BK=mY<;ZMuZ0x17#ruUt)&;FGxd~kg zSz1b)xj{)pE^cyQ4eMTaDI&FNCz?~25bfZS6n!Ed5kk(SId&7e)xfja{X?G9iA_Im2 zcq561F$LZ<1Z&#IvmU+Dk7~EXMOo~&@8cw&ojN+&DlGmCqR&w`?BFJI@cgVXNxzba z@Z-1vcSec!BVl_mt`0$r{1~H%5(Bk#m!WoxpRUWDvs?zK5+sp^J{rW_cG@$F{G7xn zLSer;IWVkDQjSX8PNAs(>x6!=A~acF0eb1>ncBi#3|*P(lsWk?w!HQ;6e9Y9XMtlX2*Iu{}z%vsKa@ zfAuxzw>IAPE$nbE>P5>V)!owm|72_l{Xq1RXPjG$pFQte;W1Cu40bn!?L<;Ej`7$+ zlMTrjWSSTO0FxU%sFdzy{H_zORET9u1uvF%Y@oU`%I%kgfVb3ihX?oAg@~lm?l=*u zP2EVxuHiow*f(<%TREUw)02!T(sb9l_|Zo<3esfkiCIe+%I*}q2Bd`9g#IZTDA0Y} z2nij1XiD(oIPeLgJe|9fQyVw4YA*V+puXKE75Ub8ZTl`>tG=p72pdnpN!(OLkq)Jj z((*@MS%7!8@k>wox``O+YKQJYG|fgtJN12Ay@~vi06k#ujAjpkX*hrlL=pU+p$Xhm#yMhY%vn9z(3fSB_*FSNl z&;;9Lyeu?eZ-)73)`TXP-uoLxjsk`OC@93|{1_Q?JsCuIXuh}I%1uok5^-LP)*WKX z3D#AUfFbJW?k9U|@D6N&&PWoZyFT7|0R0A_JO`+lN%hii*2W!8`o*&oS@J%wzgagw8s)`gQ3jn&LBKU@ zj9$@9f%s|`tHD)iiFEKAfx_Byp6nhEZ9hxL`|-ch68Q8-Iz40%;hc76MrJG zlXk@Em2uDRb>;t33S&FG;~GFV0+=D*9hB+q#sQOtq`$x74g;wOqe)9-))Nvpb!EFV zofH))G!&>uG%@JBuO@4IAz{v;VpFWTgmK|U{$<+GSx4)xRiy`^l)mNj z=0@mw$5uJ=B`@7EOcS4H%2CTCI9r;!ox*Rj^*xw;bGHUZ<>A&q;dSr zrk@*2u^TePG5N%+A&om2RkME2_jlwoROF>oc%^eNevjqy^#He;s9M9^j5}tA{^0BO z(R6A|n_dM$`lA^^dbD-3A+{2b zgJ00dw;UI!SJS7xftC|K`$M>)#ymu9KNIBYb$<$e-w|1`KV8wfU{uzK^qgtNHf?`} ziFu?jTJ5sTKqQfo>GXfmfN^i!^@(7>hm-EDQ`&Hko)2VkbteEq&^d7bH7E5SzpqCx z_~Cwij!PtM?I_gq?!#(V(skvSN)gEX~k7nOp|`Q*{$#eZHQD z9n{p1Vwdg%d4W`sQIp*2iOpKk#XB;TDUN$j$U67RxwX;jC@T&du^&MJxvQd;KXy-+ zD#Om~DSS}vPG90^rje~sZExwj)R)aUALEXOVfimf*g&X%K;@qZwII!_8tP58E+Yuy zv?=xi^;h_?%a$qU4Vb#n5y6%tLMtJnGN9E&YaZ~cpw8~;S9;YS#0N+abfj~WD(IfX zG2c50{_lnn4VfK7oPnMh1x?7x6&`$L7GlL`uFLL^e}-Of-d0vXV|=8gEi|~2U>=>zWR;Jsh)&g)Kl9=Y!7M8MvLLS z@H?rKB1@fmc(sE7P}YyKUN&T@#GG$iki_k~ADRc^;mDg*uCCdrIA7V*1qH zj)J671gKvqu6sU#u18wl3kqbg+|-3WhBjsRN4-Zm96I&mIb5tiLe!jDDK|E$A1}Sj zGu?@tP9Z*ybKh|w5f`tFqngqjZISCnSnRPn#RRp0Q%2W6y@mPQg^!iln+GjCp!A;) zqBu}mPFqj>vpd|8p|Chbc-Y6z{9SF&6_wOcPP03`!XoSO_CZ0%lm1YI)SmfkRS+5f zQkeI*>mMQo=y%)F5qo2TzT;Amkr2@#u_eA?<&QbcJ|~R_@Sfe`c;=!K30_ViqUsj6 zk9c35x$T%$hL#Y$#tx!u$F5Qz12Jg!2V*;M=gQRJ;YyVGUyQfCUsT7>r#p}Hq)`cy zQrsDbcHJ0|EV0m*z;GsIXj+f~QN_bm$`fcWX-kPwW64swh)Tec$LoudzSw^Gk1OCltVEtK;+Vxd8! zyR9s2pp0nkpIUuabH*t5h7U^n!+;ZO%V=1?``;DASXyBF_0JU+j!>WHCPmMK>s(XG z(LA|L9%Nh_{m^q=OyviOF-DO4O%RfT=LAPkH> zBHg98>-rCTzH8Y%%gBVYDXhaviT@9Qv|ZY|gN5^)6{K$OWFmh!j7q}0caaidJ~}Be zw&Al9B-4l2K*^qCvB^mGCcPeXgQ9*wk;e0S`#dvV46b&4(yy07(*bfouLJ#RYFL1R zn*JG1_^pHw*Gp0*i%dj2-YX{MfsZVd`{f#cSdd=0L^x4VCaaSS3~CuD3NAh8qBnJK zMo`I0PaOmPxeNE9%&5=fA1Pgxu>~_uiyBRl?-X>iZd$Iq%|av!)Ha*eN-hh=-D78% z`ADQEVexzU=YxMy5CO`NZ9+%QL98g5)D?%G+U8RWF7LN>MfnSQww5Cy_ zv5G3(4D-Jap>gJ&|HRegcJ>2V!jeO0^ZTE%(99J^552ZP#SWMs372+7B>c|LsL)i; z+RDOIK?KUfVCoRFhl*46_MBUL7{^=FE8l3TAhHu|#gi9hw5_gA77Mze4&G9>Cgz!z zVYw5Nw^caKZQNRK_ZqXeCNU|E{dhEAYW0wEdSK8Cy^*!kTQtvdKA%n6sDKfVcX{|R z;*xc1`GC|9Rn-VOtyR6K7sp(tvW?Y=CRA(1pXSA@wt_~Vm-z*8?VMB8V`xGvEgWD= zUW$ZuMOU=xZ7YY5c{A@6U^4Qle~1TOxn+1bQNC;Dl@#{7C!EU#>=vm)OQ>G6akY7qtYl3RMk5(gYkHaOLuE zEcOC5>Elv8ZDp4i+I;z=QROJa%T5;8_QZYC#uku|QisoQ>c~4B+s{Y054xJ; z)QqDa=PHhux_JMZS)1;fSb)yZJ2gJ$vKkV=##ooC*+$Z6EM6a0%u0_@wK~x+q|LzK z)Gwr-AvxPN8pX&4rAf)idJ4#`G0Pa|N{w(7sNCt4<<(N+lXnLL`=l;Im2?)Y?RK&9 z^J^rGonX(`@kc-Qeq|Fp;C^I%4%6K6(| zm2k0c?=HoS*FqNNp>`g8+Q*q4baWPAqKc+1*V5i>y{xFq{Id1dPY!T~rn$=qBZ$}K zY8bvTjl$s-;?qCv982bUj{c5jT3zWQ4+ z=#AgK^QF(Lb5dSNp`pdVzBhs9$KP_zww3fqrrCk7W`0PB`hUmS3}jhwEC=xtpxtR&Qs@6#A7R#Y{5F{X_5VJx+jNyNoR% zo)4;(uf^ikUNG)^#meI8TBm}4xS{^2FZy$Rhz4t(?T!oAjI!#w)A~MJZ#z?+D_5|b z!44g3tMNA7c#Tfn6Jw&`%7bMTn*R8xMkV3{S4?vcc!I=?58!m1@-iT%2;ihz)#n$} z^;{I&wHo-hFB7lqkzM=kJ(UA?@{-bzf?X%T^z|Fe+Ax6ccMCH4%b-IM4|?+~IN0gY z{;_5^IogSD@+5QEzP7ONl)7bRywB1IGS$PL@cZvRUrd(*$9IvAQfEa}u$&!{o@VQv z(%}c6_fs62tAmA}2uFUi4 z?+Ib|z}Fl(gTQk_99c;uWCm*pIl6m#>Dnahg^5W10|HpYP+6s31FLD+-{qk-C7L^mDe91&ttUXuGCX^E|vY>k$Ue?HxR-xsD{R zPmNPx-(LEM^6_i`NVK-PR-r}y8aPxfG-Obaa*gL5BM_}U?Yt7S?K$QtEksYdMCW=X zjdO0jMQ0{gWy{5kE&ULYtO80pnB0vO!Mb|?doq^Z0q$I2&mkVV_(Bwv^Mdhtn75sNs9&(N62V($bJ`)(g=^Y;7); zi&)#HFA4o~!&VOzNs#*S{fhPazQ02rL)UY;7;S%<{2mWu{Mq`J-eZrSAagNGv26~V z<-rl_dbhgz3SUfG^R1m&uNRF#Sy6@5{VPS^Dt=b>qz}-$bsg(m9%|_yDv0U$W`ACN zZW!$N8+G?IK9s4wAk`)7mde1sRloWR&d+nU$(MXVyJ@jCoo33dYVR!t*l07hcZ+k| zbMdN3G07rZqV49WK$>yoLx7$?)YE-rVXQkS&}%z$PaxD}hdpJDwe^C*Qpq~`sCED4 zew&b66lq8W<6ZHNa{+^*ml-k7f=MzY2(sYgOH{PYF^`^pg*|r!(9nD(MM~GPDrrfs zLWr9;cA|22{W7K%NJ%X;dci7xYyIqZ?&i_g+}`Wd4$+#9ny_Bp6`om`rQ^JI+EV$@ z!pUUib&8}?4&hf6^M}>RHJuj^;H|xlRoD~lDBjK;S84?urQ@lv1+CSKmUM0-x8UC3 zI#faUMbMY{Z#g76GuYiN3#J=WbZ`#SlNmUt zl-n5>*{Z4_7w3N+h`k;(vULk>5+{>wNA(@LN3&%*KCm5;Y4_329w*+!uIC~&iJ$N@tE^x1rjxD>MZ^T*zI;1^b;}N1 zSC!+OFriR%q|fY6pUY7lQ{ArYxJ2MWSzHg}Zs1h21@ohUu^$e+VE`1Ep9f3$7gx)h zl9zHkqPiAa`+O{}nyQqHJL+=riA8Gwea;}(i!a3^cSK1SWkz~(1u$-!%fueN&gG)L z=|=;D9al{Dux8@gMAvUfXQbGW&Cv;De`(=vQ5Bjq-$O0zdA_?qA2<-S5oce&a71`k zz9=ePuuJ*^U<8u`QSWV`vu5a2-V{XhKmAv>w+`xV9bd;W(?orjR1xoz$6)+57O2=CAfq}ftA3F=;AN0hI0$)BHSPe;P zUo>0((z*C<^rajlZo6eCqfE<3a!e8}wG|ms5!59@Nr)7mL9CCU}H(4e9{KvD-xzQuIzN7;SMd7H1}<%4zLdK>dGK&Kwz;7!;B*Pj30X6-mR%ij#0Awkm{Y?lgyl7 zNwfyt`cuU>8G5H<_KyqDQvIvhyQsIgss$5fZiBU|yM`9=*lR+)BQ!*n@5yhY?b`$o zIgo=l=7|dVs|em$7&UHpTW0yv4*PXW$#XnL3^}^Pnfx~pm#=uz@5c}p6@dBqr00h| zXmzNKzNEQ?u?a*RO0*i|2z}R+uKN@^n@NVZ)%vQM5rUYX?hvH4B+xC~M#+By(`oCe zb+&!nesCN;yv(tZv;)XJw|qbfR_vS>Yqxg)NLr~N(AN0gVQE2>xQMsXOO=VN#*KWA zm;YY>odwe5BL{{Nlw9zD{Xpm&_pj{G776%0oPS@AgpXvcAL%xq`2UPEsF1Zx?dD7)Fmhadm=XcbAR~f}>1g(Ll(fMXCIKu)l zKi-sCLL}lxd$GhEDV`%78ZzQZn_&Y-o_`v$(nz1Y*tRSkj??tNi$b~tiBM;9qV1G_ z1%(v!MSR#pC31F)ja^yVI;9g;sC=F+ylwYy29F=tC%k>&tyF+RgoXau4-NWF&4JQS z_rX0<-z)N_H6LejGu&u7 z$OXtzppkRn)U?L;FYJDKqFGp8ialm?67nV$&3RmJ${T}ZZ{Jq7?nKTyO!Q^cZ{aAX z+ZPkEX1+1uO5w4(wwT%{!E$n){yS71$+zwPU1hPA5xA?*S#=8H6k_qn(|&IIKrU7J zKx7`H0n8W0*%>RyQ3Qrc!%+553a0=-YlFtq~&y*XymAeN{}y!Y&v zP`H)a`+oyb-RBEjh@wFQ?94D_bKVC*4oOFM3zUlyb(JjWsBJTqsI4q*6Ew#{3(v+Q z-*vxIMgy#btwhsit8d$#_wS&SHlbxPPx=W%**EY~UUgDNiEGoA4tPY@_B>U4sg+#@ z;mHU`NS)tHSlxPzt8ZkM9QFrK{e8GyU&(WI{yM|vY5iCI(qH6X$ire3RAMK_hsh&R zOm*t@TCYo4ii&GPoIRQn!X+LsYFaL0Wc8Hc>ks?206#N&tAjH{GS9&U)dC2MyLJt; z86DX3IZm$;j#HjkCy-?@Bfyg5-&L@NhjJ4=YXP~ne$`)r9#a&4bn+q`4}#3?`M++W zD{|efO%688mY?hD#>9|Fxe8fM{4hd=?;VJNN&&azrx$bIVWW7>oNrrCcx9|fY;pc@ zWukeTZy2^clBFe~jtTj8R;&`C7N_T;m+e2T@G&36xU99OzU5f0^F&f0VelvQaXB8O z0W(;EEtppQ4VSERggPyc>%cBKz482^e*`dLW#{K{cv;2ik6+k(3W7B!-+&oyJs{FiYEQll2L2%8_aPKBR3w4h#htoSw< z)|F*>eIyVqvMn}Zr=kgeex50mJ$g8>nyqI5osIPw^r0Qai=VZs5iDDC^&^hpys)~5 z1k&>^To0nbw=V~LcF14ULj}yZSlz_kMRHo;6%%fo`H)yQ{gdJ1Mop%qZ-y6MGJWWT zNg(ROD=J?U@Y*>2{6aEhRJYotIO3dRwHa_OksA0W)5rgIK+Wxb(f=) zXityT{lWkr!EgW`}F9wAx@3)?Q&b=-9=*Sd^waJDam{+R|?-eBc41i;s}j zJ@n;!z4qU_-O9-!kBQ}DUOT5dS4R!Zb#MU_`4ZAQs3F{=2MV|#6LA8YlUP~2K)MPy zzbTXd+OOLiety>^Ipnb|0BP$GWSyO56<*u+_BjRGJ3;fu3{3SH1!eA5{oDs;cYD}q8il|J}KgXZ!YwF<9T~Rz0Nr3 zxfDe8xcP0FtUdjV6~$nM`z1=A$Iy0B8ZDIiQJ~A3F-NBKr;^TmsYMx?@lM-brS`Jt zx)Pz!xGA~uB)1nh>IL9<<>s}QIFSLoad~8zFn{P1yRCFlww!udH)cZ_T%K<(RIEfX zbj}l%M@=-$oL-k8LU~rS(8EqPWh-c)#s9zbhg)8AU{49I<#x6zt(XlKCdnec;X+u8xz#9elIx%=9E`W1;nkYeUutqDf*>0nb2Plav|T z9ASnpAL=%X*E8*Fk)cZG!$)lz2Yz55+(GidYl&=!ocgHTkQ;>CI_ zZGCV5ogGt=&?iIJ`srbY)B#BrmT-xKIqEUTigC9%X2yIVSEK7nKK7Ys?wf?|v(muF z3sEjUI!76R@Q&+ASIN(hhN4B=4^})Mb{>h%m9RtGuP)bhFYxBC<#fF`^ar8dcJ93o zw0Ejxd9UfwG$>^>_fL&G5t1?`W{OPxz@yrbQM+;J5i$q*IH7g0`6KtR(TnZ+@ux3N z$0x}iXY^)}P%(`kyS;k#Dyo5pqmEj>#lpcN?1#(0C%SD~2mwm|7 ze-aFTZX4CPTPNA1RH8P13gw}T2ttiPGG?c1Kl`-qI~`7ilQOkKKDSFuTEOoKzS&J26? z$bn%=_c~G({&T!;>C!YkN>!26N{y6c()vFeEdPze=Eh9<|Aw$T|9MUSFKFWTuSr;L ar9i_1b4z4gZ{50e>#>%;CI$=*`Tqbn4+RMT From bd3d08db3bbc6914cba55db5db87b31b8321fbc3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:00:23 -0700 Subject: [PATCH 38/66] prepend Interface with High Fidelity in setup options --- cmake/templates/NSIS.template.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f268feab37..f92e69c511 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -387,7 +387,7 @@ Function PostInstallOptionsPage StrCpy $OffsetUnits u ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@" Pop $DesktopClientCheckbox IntOp $CurrentOffset $CurrentOffset + 15 From 02d93e2a1124cf61a25dd7d903ae2f1f3f209e4c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:09:36 -0700 Subject: [PATCH 39/66] cleanup fixes for old shortcuts in NSIS script --- cmake/macros/SetPackagingParameters.cmake | 7 ++++++ cmake/templates/CPackProperties.cmake.in | 4 ++++ cmake/templates/NSIS.template.in | 26 ++++++++++++----------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index cdbddf84e5..ef885df09e 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -90,6 +90,13 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_SHORTCUT_NAME "Interface - ${BUILD_VERSION}") set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}") endif () + + set(INTERFACE_HF_SHORTCUT_NAME "High Fidelity ${INTERFACE_SHORTCUT_NAME}") + set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}") + + set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity") + set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console") + # check if we need to find signtool if (PRODUCTION_BUILD OR PR_BUILD) find_program(SIGNTOOL_EXECUTABLE signtool PATHS "C:/Program Files (x86)/Windows Kits/8.1" PATH_SUFFIXES "bin/x64") diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in index 164e432706..d22ba1f5e1 100644 --- a/cmake/templates/CPackProperties.cmake.in +++ b/cmake/templates/CPackProperties.cmake.in @@ -10,10 +10,14 @@ # set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@") +set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@") set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe") set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@") set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@") +set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@") set(CONSOLE_WIN_EXEC_NAME "@CONSOLE_EXEC_NAME@") +set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@") +set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@") set(DS_EXEC_NAME "@DS_EXEC_NAME@") set(AC_EXEC_NAME "@AC_EXEC_NAME@") set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@") diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index f92e69c511..8c494620e5 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -416,7 +416,7 @@ Function PostInstallOptionsPage ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" ${Else} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install" ${EndIf} Pop $LaunchNowCheckbox @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\High Fidelity @INTERFACE_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -496,7 +496,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to Sandbox ${If} $DesktopServerState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\High Fidelity @CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES ${Else} !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -506,11 +506,11 @@ Function HandlePostInstallOptions ${If} $ServerStartupState == ${BST_CHECKED} ; in case we added a shortcut in the global context, pull that now SetShellVarContext all - Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; make a startup shortcut in this user's current context SetShellVarContext current - CreateShortCut "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" + CreateShortCut "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" ; reset the shell var context back SetShellVarContext all @@ -591,14 +591,16 @@ Section "-Core installation" ; Delete old desktop shortcuts before they were renamed during Sandbox rename Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old Start Menu shortcuts before Sandbox rename - Delete "$SMPROGRAMS\$STARTMENU_FOLDER\High Fidelity.lnk" - Delete "$SMPROGRAMS\$STARTMENU_FOLDER\Server Console.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old startup item for Server Console before Sandbox rename - Delete "$SMSTARTUP\Server Console.lnk" + SetShellVarContext current + Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" + SetShellVarContext all ; Rename the incorrectly cased Raleway font Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml" @@ -880,12 +882,12 @@ Section "Uninstall" Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\@INTERFACE_SHORTCUT_NAME@.lnk" Delete "$SMPROGRAMS\$MUI_TEMP\@CONSOLE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" - Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" ; if it exists, delete the startup shortcut for the current user SetShellVarContext current - Delete "$SMSTARTUP\@CONSOLE_SHORTCUT_NAME@.lnk" + Delete "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" SetShellVarContext all @CPACK_NSIS_DELETE_ICONS@ From 8be3931bbf6039e14b4d4b852659b8b44a366966 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:20:31 -0700 Subject: [PATCH 40/66] repair shortcut name for desktop interface --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 8c494620e5..e7ea3dfb2b 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -485,7 +485,7 @@ Function HandlePostInstallOptions ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ; check if the user asked for a desktop shortcut to High Fidelity ${If} $DesktopClientState == ${BST_CHECKED} - CreateShortCut "$DESKTOP\@INTERFACE_DESKTOP_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" + CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WritePostInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES ${Else} !insertmacro WritePostInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO @@ -590,7 +590,7 @@ Section "-Core installation" Delete "$INSTDIR\xinput1_3.dll" ; Delete old desktop shortcuts before they were renamed during Sandbox rename - Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk" + Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk" Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk" ; Delete old Start Menu shortcuts before Sandbox rename From 53c16280bdfe24d9e71181baa7a438156fecfca1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:22:57 -0700 Subject: [PATCH 41/66] remove code for stack manager migration --- server-console/src/main.js | 141 ------------------------------------- 1 file changed, 141 deletions(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index b36d798a30..7183edfc25 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -347,134 +347,6 @@ function goHomeClicked() { } } -function stackManagerBasePath() { - var dataPath = 'High Fidelity/Stack Manager/resources'; - - if (process.platform == "win32") { - return path.resolve(osHomeDir(), 'AppData/Local', dataPath); - } else if (process.platform == "darwin") { - return path.resolve(osHomeDir(), 'Library/Application Support', dataPath); - } else { - return "" - } -} - -function isStackManagerContentPresent() { - var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz'); - - try { - var stats = fs.lstatSync(modelsPath); - - if (stats.isFile()) { - console.log("Stack Manager entities file discovered at " + modelsPath) - // we found a content file - return true; - } - } catch (e) { - console.log("Stack Manager entities file not found at " + modelsPath); - } -} - -function promptToMigrateContent() { - dialog.showMessageBox({ - type: 'question', - buttons: ['Yes', 'No'], - title: 'Migrate Content', - message: 'Are you sure?\n\nThis will stop your home server and replace everything in your home with your content from Stack Manager.' - }, function(index) { - if (index == 0) { - if (homeServer.state != ProcessGroupStates.STOPPED) { - var stopThenMigrateCallback = function(processGroup) { - if (isShuttingDown) { - homeServer.removeListener('state-update', stopThenMigrateCallback); - } else if (processGroup.state == ProcessGroupStates.STOPPED) { - performContentMigration(); - - homeServer.removeListener('state-update', stopThenMigrateCallback); - } - }; - - homeServer.on('state-update', stopThenMigrateCallback); - homeServer.stop(); - - } else { - performContentMigration(); - } - } - }); -} - -function performContentMigration() { - // check if there is a models file to migrate - var modelsPath = path.resolve(stackManagerBasePath(), 'models.json.gz'); - - try { - var stats = fs.lstatSync(modelsPath); - } catch (e) { - // no entities file - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Models File Not Found', - message: 'There is no models file at ' + modelsPath + '\n\nStack Manager content migration can not proceed.' - }, null); - - return; - } - - function showMigrationCompletionDialog(copyError) { - if (!copyError) { - // show message for successful migration - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Migration Complete', - message: 'Your Stack Manager content has been migrated.\n\nYour home server will now be restarted.' - }, null); - } else { - // show error message for copy fail - dialog.showMessageBox({ - type: 'info', - buttons: ['OK'], - title: 'Migration Failed', - message: 'There was an error copying your Stack Manager content: ' + copyError + '\n\nPlease try again.' - }, null); - } - } - - // we have a models file, try and copy it - var newModelsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'entities/models.json.gz') - console.log("Copying Stack Manager entity file from " + modelsPath + " to " + newModelsPath); - - try { - fs.copySync(modelsPath, newModelsPath); - - // check if there are any assets to copy - var oldAssetsPath = path.resolve(stackManagerBasePath(), 'assets'); - - var assets = fs.readdirSync(oldAssetsPath); - - if (assets.length > 0) { - // assume this means the directory is not empty - // and that we should copy it - var newAssetsPath = path.resolve(getAssignmentClientResourcesDirectory(), 'assets'); - - console.log("Copying Stack Manager assets from " + oldAssetsPath + " to " + newAssetsPath); - - // attempt to copy the assets folder - fs.copySync(oldAssetsPath, newAssetsPath, { - preserveTimestamps: true - }); - } - - showMigrationCompletionDialog(null); - } catch (error) { - showMigrationCompletionDialog(error); - } - - homeServer.start(); -} - var logWindow = null; var labels = { @@ -530,12 +402,6 @@ var labels = { shell.openExternal('http://localhost:40100/settings/?action=share') } }, - migrateContent: { - label: 'Migrate Stack Manager Content', - click: function() { - promptToMigrateContent(); - } - }, shuttingDown: { label: "Shutting down...", enabled: false @@ -569,13 +435,6 @@ function buildMenuArray(serverState) { menuArray.push(labels.share); menuArray.push(separator); menuArray.push(labels.quit); - - var foundStackManagerContent = isStackManagerContentPresent(); - if (foundStackManagerContent) { - // add a separator and the stack manager content migration option - menuArray.splice(menuArray.length - 1, 0, labels.migrateContent, separator); - } - } From 7c0c48458e0f3a30aa4e12d55836d50a712036a4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:25:47 -0700 Subject: [PATCH 42/66] remove padding from stack manager migration block --- server-console/src/splash.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server-console/src/splash.css b/server-console/src/splash.css index bd3a06cbe3..0782cf5314 100644 --- a/server-console/src/splash.css +++ b/server-console/src/splash.css @@ -125,10 +125,6 @@ h2 { border-bottom: 2px solid #F5F6F6; } -#existing-resources-area { - padding-top: 20px; -} - .footer { padding-top: 34px; } @@ -143,4 +139,4 @@ h2 { input[type="checkbox"] { -webkit-transform: scale(1.4); display: inline-block; -} \ No newline at end of file +} From c2c7ae89db0dd5429925319a78a68fdadd69f032 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:27:44 -0700 Subject: [PATCH 43/66] remove bottom section from server-console splash --- server-console/src/main.js | 2 +- server-console/src/splash.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server-console/src/main.js b/server-console/src/main.js index 7183edfc25..26ec2dd536 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -583,7 +583,7 @@ function maybeShowSplash() { var window = new BrowserWindow({ icon: appIcon, width: 1600 * zoomFactor, - height: 737 * zoomFactor, + height: 650 * zoomFactor, center: true, frame: true, useContentSize: true, diff --git a/server-console/src/splash.css b/server-console/src/splash.css index 0782cf5314..5a911e3872 100644 --- a/server-console/src/splash.css +++ b/server-console/src/splash.css @@ -122,7 +122,6 @@ h2 { #main-content { height: 350px; - border-bottom: 2px solid #F5F6F6; } .footer { From 26e01bbacdfac3bf07eb76f6eca87e37b4934aae Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 13:33:49 -0700 Subject: [PATCH 44/66] rewrite a bunch of path/url mangling code --- libraries/script-engine/src/ScriptEngine.cpp | 2 +- libraries/script-engine/src/ScriptEngines.cpp | 130 ++++++++++-------- libraries/script-engine/src/ScriptEngines.h | 6 +- libraries/script-engine/src/ScriptsModel.cpp | 33 +++-- libraries/shared/src/PathUtils.cpp | 10 +- libraries/shared/src/PathUtils.h | 2 +- 6 files changed, 104 insertions(+), 79 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 3f403b3677..883cd0c5c6 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -234,7 +234,7 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { void ScriptEngine::scriptContentsAvailable(const QUrl& url, const QString& scriptContents) { _scriptContents = scriptContents; if (_wantSignals) { - emit scriptLoaded(_fileNameString); + emit scriptLoaded(url.toString()); } } diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index a62deb89bc..96e4180704 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -42,52 +42,49 @@ ScriptEngines::ScriptEngines() _scriptsModelFilter.setDynamicSortFilter(true); } -QString normalizeScriptUrl(const QString& rawScriptUrl) { - if (!rawScriptUrl.startsWith("http:") && !rawScriptUrl.startsWith("https:") && !rawScriptUrl.startsWith("atp:")) { -#ifdef Q_OS_LINUX - if (rawScriptUrl.startsWith("file:")) { - return rawScriptUrl; +QUrl normalizeScriptURL(const QUrl& rawScriptURL) { + if (rawScriptURL.scheme() == "file") { + QUrl fullNormal = rawScriptURL; + QUrl defaultScriptLoc = defaultScriptsLocation(); + + #ifdef Q_OS_LINUX + #else + // Force lowercase on file scripts because of drive letter weirdness. + if (rawScriptURL.isLocalFile()) { + fullNormal.setPath(fullNormal.path.toLower()); } - return QUrl::fromLocalFile(rawScriptUrl).toString(); -#else - QString fullNormal; - if (rawScriptUrl.startsWith("file:")) { - fullNormal = rawScriptUrl.toLower(); - } else { - // Force lowercase on file scripts because of drive letter weirdness. - fullNormal = QUrl::fromLocalFile(rawScriptUrl).toString().toLower(); - } - QString defaultScriptLoc = defaultScriptsLocation(); - if (fullNormal.startsWith(defaultScriptLoc)) { - return "~" + fullNormal.mid(defaultScriptLoc.size()); + #endif + // if this url is something "beneath" the default script url, replace the local path with ~ + if (fullNormal.scheme() == defaultScriptLoc.scheme() && + fullNormal.host() == defaultScriptLoc.host() && + fullNormal.path().startsWith(defaultScriptLoc.path())) { + fullNormal.setPath("/~/" + fullNormal.path().mid(defaultScriptLoc.path().size())); } return fullNormal; -#endif - + } else if (rawScriptURL.scheme() == "http" || rawScriptURL.scheme() == "https" || rawScriptURL.scheme() == "atp") { + return rawScriptURL; + } else { + // don't accidently support gopher + return QUrl(""); } - return QUrl(rawScriptUrl).toString(); } -QString expandScriptUrl(const QString& normalizedScriptURL) { - if (normalizedScriptURL.startsWith("http:") || - normalizedScriptURL.startsWith("https:") || - normalizedScriptURL.startsWith("atp:")) { - return QUrl(normalizedScriptURL).toString(); - } - - QUrl url; - if (normalizedScriptURL.startsWith("file:")) { - url = QUrl(normalizedScriptURL); +QUrl expandScriptUrl(const QUrl& normalizedScriptURL) { + if (normalizedScriptURL.scheme() == "http" || + normalizedScriptURL.scheme() == "https" || + normalizedScriptURL.scheme() == "atp") { + return normalizedScriptURL; + } else if (normalizedScriptURL.scheme() == "file") { + if (normalizedScriptURL.path().startsWith("/~/")) { + QUrl url = normalizedScriptURL; + QStringList splitPath = url.path().split("/"); + QUrl defaultScriptsLoc = defaultScriptsLocation(); + url.setPath(defaultScriptsLoc.path() + "/" + splitPath.mid(2).join("/")); // 2 to skip the slashes in /~/ + return url; + } + return normalizedScriptURL; } else { - url = QUrl::fromLocalFile(normalizedScriptURL); - } - - QString path = url.path(); - QStringList splitPath = path.split("/"); - if (splitPath.size() > 0 && splitPath[0] == "~") { - QString defaultScriptLoc = defaultScriptsLocation(); - url.setPath(defaultScriptLoc + splitPath.mid(1).join("/")); - return url.toString(); + return QUrl(""); } } @@ -229,14 +226,21 @@ QVariantList ScriptEngines::getRunning() { auto runningScripts = getRunningScripts(); foreach(const QString& runningScript, runningScripts) { QUrl runningScriptURL = QUrl(runningScript); - if (runningScriptURL.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) { + if (!runningScriptURL.isValid()) { runningScriptURL = QUrl::fromLocalFile(runningScriptURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded))); } QVariantMap resultNode; resultNode.insert("name", runningScriptURL.fileName()); - resultNode.insert("url", runningScriptURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded))); + QUrl displayURL = expandScriptUrl(QUrl(runningScriptURL)); + QString displayURLString; + if (displayURL.isLocalFile()) { + displayURLString = displayURL.toLocalFile(); + } else { + displayURLString = displayURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded)); + } + resultNode.insert("url", displayURLString); // The path contains the exact path/URL of the script, which also is used in the stopScript function. - resultNode.insert("path", runningScript); + resultNode.insert("path", normalizeScriptURL(runningScript).toString()); resultNode.insert("local", runningScriptURL.isLocalFile()); result.append(resultNode); } @@ -247,7 +251,9 @@ QVariantList ScriptEngines::getRunning() { static const QString SETTINGS_KEY = "Settings"; void ScriptEngines::loadDefaultScripts() { - loadScript(defaultScriptsLocation() + "/scripts/defaultScripts.js"); + QUrl defaultScriptsLoc = defaultScriptsLocation(); + defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "/scripts/defaultScripts.js"); + loadScript(defaultScriptsLoc.toString()); } void ScriptEngines::loadOneScript(const QString& scriptFilename) { @@ -296,7 +302,7 @@ void ScriptEngines::saveScripts() { for (auto it = runningScripts.begin(); it != runningScripts.end(); ++it) { if (getScriptEngine(*it)->isUserLoaded()) { settings.setArrayIndex(i); - settings.setValue("script", *it); + settings.setValue("script", normalizeScriptURL(*it).toString()); ++i; } } @@ -338,11 +344,16 @@ void ScriptEngines::stopAllScripts(bool restart) { } } -bool ScriptEngines::stopScript(const QString& rawScriptUrl, bool restart) { +bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { bool stoppedScript = false; { + QUrl scriptURL = normalizeScriptURL(QUrl(rawScriptURL)); + if (!scriptURL.isValid()) { + scriptURL = normalizeScriptURL(QUrl::fromLocalFile(rawScriptURL)); + } + const QString scriptURLString = scriptURL.toString(); + QReadLocker lock(&_scriptEnginesHashLock); - const QString scriptURLString = normalizeScriptUrl(rawScriptUrl); if (_scriptEnginesHash.contains(scriptURLString)) { ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURLString]; if (restart) { @@ -375,18 +386,19 @@ void ScriptEngines::reloadAllScripts() { stopAllScripts(true); } -ScriptEngine* ScriptEngines::loadScript(const QString& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor, bool activateMainWindow, bool reload) { +ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor, + bool activateMainWindow, bool reload) { if (thread() != QThread::currentThread()) { ScriptEngine* result { nullptr }; QMetaObject::invokeMethod(this, "loadScript", Qt::BlockingQueuedConnection, Q_RETURN_ARG(ScriptEngine*, result), - Q_ARG(QString, scriptFilename), + Q_ARG(QUrl, scriptFilename), Q_ARG(bool, isUserLoaded), Q_ARG(bool, loadScriptFromEditor), Q_ARG(bool, activateMainWindow), Q_ARG(bool, reload)); return result; } - QUrl scriptUrl(scriptFilename); + QUrl scriptUrl = normalizeScriptURL(scriptFilename); auto scriptEngine = getScriptEngine(scriptUrl.toString()); if (scriptEngine) { return scriptEngine; @@ -399,7 +411,7 @@ ScriptEngine* ScriptEngines::loadScript(const QString& scriptFilename, bool isUs }, Qt::QueuedConnection); - if (scriptFilename.isNull()) { + if (scriptFilename.isEmpty()) { launchScriptEngine(scriptEngine); } else { // connect to the appropriate signals of this script engine @@ -407,17 +419,17 @@ ScriptEngine* ScriptEngines::loadScript(const QString& scriptFilename, bool isUs connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError); // get the script engine object to load the script at the designated script URL - scriptEngine->loadURL(scriptUrl, reload); + scriptEngine->loadURL(QUrl(expandScriptUrl(scriptUrl.toString())), reload); } return scriptEngine; } -ScriptEngine* ScriptEngines::getScriptEngine(const QString& rawScriptUrl) { +ScriptEngine* ScriptEngines::getScriptEngine(const QString& rawScriptURL) { ScriptEngine* result = nullptr; { QReadLocker lock(&_scriptEnginesHashLock); - const QString scriptURLString = normalizeScriptUrl(rawScriptUrl); + const QString scriptURLString = normalizeScriptURL(QUrl(rawScriptURL)).toString(); auto it = _scriptEnginesHash.find(scriptURLString); if (it != _scriptEnginesHash.end()) { result = it.value(); @@ -427,15 +439,17 @@ ScriptEngine* ScriptEngines::getScriptEngine(const QString& rawScriptUrl) { } // FIXME - change to new version of ScriptCache loading notification -void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptUrl) { - UserActivityLogger::getInstance().loadedScript(rawScriptUrl); +void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) { + UserActivityLogger::getInstance().loadedScript(rawScriptURL); ScriptEngine* scriptEngine = qobject_cast(sender()); launchScriptEngine(scriptEngine); { QWriteLocker lock(&_scriptEnginesHashLock); - const QString scriptURLString = normalizeScriptUrl(rawScriptUrl); + QUrl url = QUrl(rawScriptURL); + QUrl normalized = normalizeScriptURL(url); + const QString scriptURLString = normalized.toString(); _scriptEnginesHash.insertMulti(scriptURLString, scriptEngine); } emit scriptCountChanged(); @@ -458,11 +472,11 @@ void ScriptEngines::launchScriptEngine(ScriptEngine* scriptEngine) { } -void ScriptEngines::onScriptFinished(const QString& rawScriptUrl, ScriptEngine* engine) { +void ScriptEngines::onScriptFinished(const QString& rawScriptURL, ScriptEngine* engine) { bool removed = false; { QWriteLocker lock(&_scriptEnginesHashLock); - const QString scriptURLString = normalizeScriptUrl(rawScriptUrl); + const QString scriptURLString = normalizeScriptURL(QUrl(rawScriptURL)).toString(); for (auto it = _scriptEnginesHash.find(scriptURLString); it != _scriptEnginesHash.end(); ++it) { if (it.value() == engine) { _scriptEnginesHash.erase(it); diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h index ab0d17d9f3..a0d914ec64 100644 --- a/libraries/script-engine/src/ScriptEngines.h +++ b/libraries/script-engine/src/ScriptEngines.h @@ -51,7 +51,7 @@ public: ScriptsModelFilter* scriptsModelFilter() { return &_scriptsModelFilter; }; Q_INVOKABLE void loadOneScript(const QString& scriptFilename); - Q_INVOKABLE ScriptEngine* loadScript(const QString& scriptFilename = QString(), + Q_INVOKABLE ScriptEngine* loadScript(const QUrl& scriptFilename = QString(), bool isUserLoaded = true, bool loadScriptFromEditor = false, bool activateMainWindow = false, bool reload = false); Q_INVOKABLE bool stopScript(const QString& scriptHash, bool restart = false); @@ -96,7 +96,7 @@ protected: ScriptsModelFilter _scriptsModelFilter; }; -QString normalizeScriptUrl(const QString& rawScriptUrl); -QString expandScriptUrl(const QString& normalizedScriptURL); +QUrl normalizeScriptURL(const QUrl& rawScriptURL); +QUrl expandScriptUrl(const QUrl& normalizedScriptURL); #endif // hifi_ScriptEngine_h diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index 5b368095e0..f616847528 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -158,14 +158,21 @@ void ScriptsModel::requestDefaultFiles(QString marker) { QUrl url(defaultScriptsLocation()); if (url.isLocalFile()) { - QString localDir = url.toLocalFile() + "/scripts"; + // if the url indicates a local directory, use QDirIterator + // QString localDir = url.toLocalFile() + "/scripts"; + QString localDir = expandScriptUrl(url).toLocalFile() + "/scripts"; + int localDirPartCount = localDir.split("/").size(); QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { - QString jsFullPath = normalizeScriptUrl(it.next()); - QString jsPartialPath = normalizeScriptUrl(jsFullPath.mid(localDir.length() + 1)); // + 1 to skip a separator - _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath, SCRIPT_ORIGIN_DEFAULT)); + QUrl jsFullPath = QUrl::fromLocalFile(it.next()); + // QString jsPartialPath = jsFullPath.path().mid(localDir.length() + 1); // + 1 to skip a separator + QString jsPartialPath = jsFullPath.path().split("/").mid(localDirPartCount).join("/"); + jsFullPath = normalizeScriptURL(jsFullPath); + _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath.toString(), SCRIPT_ORIGIN_DEFAULT)); } + _loadingScripts = false; } else { + // the url indicates http(s), use QNetworkRequest QUrlQuery query; query.addQueryItem(PREFIX_PARAMETER_NAME, MODELS_LOCATION); if (!marker.isEmpty()) { @@ -227,11 +234,13 @@ bool ScriptsModel::parseXML(QByteArray xmlFile) { while (!(xml.tokenType() == QXmlStreamReader::EndElement && xml.name() == CONTAINER_NAME)) { if (xml.tokenType() == QXmlStreamReader::StartElement && xml.name() == KEY_NAME) { xml.readNext(); - lastKey = normalizeScriptUrl(xml.text().toString()); + lastKey = xml.text().toString(); if (jsRegex.exactMatch(xml.text().toString())) { - _treeNodes.append(new TreeNodeScript(lastKey.mid(MODELS_LOCATION.length()), - defaultScriptsLocation() + "/" + lastKey, - SCRIPT_ORIGIN_DEFAULT)); + QString localPath = lastKey.split("/").mid(1).join("/"); + QUrl fullPath = defaultScriptsLocation(); + fullPath.setPath(fullPath.path() + "/" + lastKey); + const QString fullPathStr = normalizeScriptURL(fullPath).toString(); + _treeNodes.append(new TreeNodeScript(localPath, fullPathStr, SCRIPT_ORIGIN_DEFAULT)); } } xml.readNext(); @@ -274,9 +283,9 @@ void ScriptsModel::reloadLocalFiles() { const QFileInfoList localFiles = _localDirectory.entryInfoList(); for (int i = 0; i < localFiles.size(); i++) { QFileInfo file = localFiles[i]; - QString fileName = normalizeScriptUrl(file.fileName()); - QString absPath = normalizeScriptUrl(file.absoluteFilePath()); - _treeNodes.append(new TreeNodeScript(fileName, absPath, SCRIPT_ORIGIN_LOCAL)); + QString fileName = file.fileName(); + QUrl absPath = normalizeScriptURL(QUrl::fromLocalFile(file.absoluteFilePath())); + _treeNodes.append(new TreeNodeScript(fileName, absPath.toString(), SCRIPT_ORIGIN_LOCAL)); } rebuildTree(); endResetModel(); @@ -302,7 +311,7 @@ void ScriptsModel::rebuildTree() { for (pathIterator = pathList.constBegin(); pathIterator != pathList.constEnd(); ++pathIterator) { hash.append(*pathIterator + "/"); if (!folders.contains(hash)) { - folders[hash] = new TreeNodeFolder(normalizeScriptUrl(*pathIterator), parent); + folders[hash] = new TreeNodeFolder(*pathIterator, parent); } parent = folders[hash]; } diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 2e8d4a4e6a..0fe11df28a 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "PathUtils.h" @@ -54,12 +55,13 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); QString findMostRecentFileExtension(const QString& originalFileName, QVector possibleExtensions); -QString defaultScriptsLocation(); +QUrl defaultScriptsLocation(); #endif // hifi_PathUtils_h From f5333423ffec9bba8a92b7fefc1b7a15ec860aad Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 13:43:06 -0700 Subject: [PATCH 45/66] remove unused variable --- libraries/script-engine/src/ScriptEngines.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 96e4180704..65307a5a4d 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -221,7 +221,6 @@ QVariantList ScriptEngines::getLocal() { } QVariantList ScriptEngines::getRunning() { - const int WINDOWS_DRIVE_LETTER_SIZE = 1; QVariantList result; auto runningScripts = getRunningScripts(); foreach(const QString& runningScript, runningScripts) { From 0a8072164d654599d3a6b0626f1912f7514711b2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:44:16 -0700 Subject: [PATCH 46/66] be less redundant in prompt for running applications --- cmake/templates/NSIS.template.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index e7ea3dfb2b..28cb20dd1c 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -737,8 +737,8 @@ SectionEnd !macroend !macro CheckForRunningApplications action prompter - !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "High Fidelity Interface" ${action} ${prompter} - !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "High Fidelity Sandbox" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "@CONSOLE_SHORTCUT_NAME@" ${action} ${prompter} + !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "@INTERFACE_SHORTCUT_NAME@" ${action} ${prompter} !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "Domain Server" ${action} ${prompter} !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "Assignment Client" ${action} ${prompter} !macroend From 7d042fc47de5eff20329eeb64298e3ace470bb2d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:54:55 -0700 Subject: [PATCH 47/66] keep server-console as sandbox folder in Program Files --- cmake/macros/SetPackagingParameters.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index ef885df09e..63e7a1a174 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -64,7 +64,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns") else () if (WIN32) - set(CONSOLE_INSTALL_DIR "sandbox") + set(CONSOLE_INSTALL_DIR "server-console") else () set(CONSOLE_INSTALL_DIR ".") endif () From f29647b5191214f440a13cc857c0efc1e31c1273 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 13:56:57 -0700 Subject: [PATCH 48/66] use HF shortcuts for setup options --- cmake/templates/NSIS.template.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 28cb20dd1c..0e30d8aa2a 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -387,7 +387,7 @@ Function PostInstallOptionsPage StrCpy $OffsetUnits u ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @INTERFACE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@" Pop $DesktopClientCheckbox IntOp $CurrentOffset $CurrentOffset + 15 @@ -396,7 +396,7 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for High Fidelity @CONSOLE_SHORTCUT_NAME@" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@" Pop $DesktopServerCheckbox ; set the checkbox state depending on what is present in the registry @@ -404,7 +404,7 @@ Function PostInstallOptionsPage IntOp $CurrentOffset $CurrentOffset + 15 - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ on startup" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup" Pop $ServerStartupCheckbox ; set the checkbox state depending on what is present in the registry @@ -414,9 +414,9 @@ Function PostInstallOptionsPage ${EndIf} ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @CONSOLE_SHORTCUT_NAME@ after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ after install" ${Else} - ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch High Fidelity @INTERFACE_SHORTCUT_NAME@ after install" + ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install" ${EndIf} Pop $LaunchNowCheckbox From 3cf2eeb4d57e977a417c394d273255c82cc50321 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 30 Mar 2016 13:58:32 -0700 Subject: [PATCH 49/66] IMproving the perfplot qml and adding 2 more info --- .../utilities/render/plotperf/PlotPerf.qml | 75 ++++++--- examples/utilities/render/stats.qml | 158 +++++++++++++++--- 2 files changed, 184 insertions(+), 49 deletions(-) diff --git a/examples/utilities/render/plotperf/PlotPerf.qml b/examples/utilities/render/plotperf/PlotPerf.qml index 7141ea77d0..179707c0f1 100644 --- a/examples/utilities/render/plotperf/PlotPerf.qml +++ b/examples/utilities/render/plotperf/PlotPerf.qml @@ -15,40 +15,64 @@ Item { id: root width: parent.width height: 100 + + // The title of the graph property string title - property var config - property string parameters - // THis is my hack to get the name of the first property and assign it to a trigger var in order to get + // THe object used as the default source object for the prop plots + property var object + + // THis is my hack to get a property and assign it to a trigger var in order to get // a signal called whenever the value changed - property var trigger: config[parameters.split(":")[3].split("-")[0]] + property var trigger + + // Plots is an array of plot descriptor + // a default plot descriptor expects the following object: + // prop: [ { + // object: {} // Optional: this is the object from which the prop will be fetched, + // if nothing than the object from root is used + // prop:"bufferCPUCount", // Needed the name of the property from the object to feed the plot + // label: "CPU", // Optional: Label as displayed on the plot + // color: "#00B4EF" // Optional: Color of the curve + // unit: "km/h" // Optional: Unit added to the value displayed, if nothing then the default unit is used + // scale: 1 // Optional: Extra scaling used to represent the value, this scale is combined with the global scale. + // }, + property var plots + + // Default value scale used to define the max value of the chart + property var valueScale: 1 + + // Default value unit appended to the value displayed + property var valueUnit: "" + + // Default number of digits displayed + property var valueNumDigits: 0 + - property var inputs: parameters.split(":") - property var valueScale: +inputs[0] - property var valueUnit: inputs[1] - property var valueNumDigits: inputs[2] - property var input_VALUE_OFFSET: 3 property var valueMax : 1 property var _values : new Array() property var tick : 0 function createValues() { - if (inputs.length > input_VALUE_OFFSET) { - for (var i = input_VALUE_OFFSET; i < inputs.length; i++) { - var varProps = inputs[i].split("-") - _values.push( { - value: varProps[0], - valueMax: 1, - numSamplesConstantMax: 0, - valueHistory: new Array(), - label: varProps[1], - color: varProps[2], - scale: (varProps.length > 3 ? varProps[3] : 1), - unit: (varProps.length > 4 ? varProps[4] : valueUnit) - }) - } - } + print("trigger is: " + JSON.stringify(trigger)) + if (Array.isArray(plots)) { + for (var i =0; i < plots.length; i++) { + var plot = plots[i]; + print(" a pnew Plot:" + JSON.stringify(plot)); + _values.push( { + object: (plot["object"] !== undefined ? plot["object"] : root.object), + value: plot["prop"], + valueMax: 1, + numSamplesConstantMax: 0, + valueHistory: new Array(), + label: (plot["label"] !== undefined ? plot["label"] : ""), + color: (plot["color"] !== undefined ? plot["color"] : "white"), + scale: (plot["scale"] !== undefined ? plot["scale"] : 1), + unit: (plot["unit"] !== undefined ? plot["unit"] : valueUnit) + }) + } + } print("in creator" + JSON.stringify(_values)); } @@ -69,7 +93,8 @@ Item { var currentValueMax = 0 for (var i = 0; i < _values.length; i++) { - var currentVal = config[_values[i].value] * _values[i].scale; + var currentVal = _values[i].object[_values[i].value] * _values[i].scale; + _values[i].valueHistory.push(currentVal) _values[i].numSamplesConstantMax++; diff --git a/examples/utilities/render/stats.qml b/examples/utilities/render/stats.qml index ae5b433678..6326910220 100644 --- a/examples/utilities/render/stats.qml +++ b/examples/utilities/render/stats.qml @@ -30,51 +30,161 @@ Item { PlotPerf { title: "Num Buffers" - config: stats.config height: parent.evalEvenHeight() - parameters: "1::0:bufferCPUCount-CPU-#00B4EF:bufferGPUCount-GPU-#1AC567" + object: stats.config + trigger: stats.config["bufferCPUCount"] + plots: [ + { + prop: "bufferCPUCount", + label: "CPU", + color: "#00B4EF" + }, + { + prop: "bufferGPUCount", + label: "GPU", + color: "#1AC567" + } + ] } PlotPerf { title: "gpu::Buffer Memory" - config: stats.config height: parent.evalEvenHeight() - parameters: "1048576:Mb:1:bufferCPUMemoryUsage-CPU-#00B4EF:bufferGPUMemoryUsage-GPU-#1AC567" + object: stats.config + trigger: stats.config["bufferCPUMemoryUsage"] + valueScale: 1048576 + valueUnit: "Mb" + valueNumDigits: "1" + plots: [ + { + prop: "bufferCPUMemoryUsage", + label: "CPU", + color: "#00B4EF" + }, + { + prop: "bufferGPUMemoryUsage", + label: "GPU", + color: "#1AC567" + } + ] } - PlotPerf { title: "Num Textures" - config: stats.config height: parent.evalEvenHeight() - parameters: "1::0:textureCPUCount-CPU-#00B4EF:textureGPUCount-GPU-#1AC567:frameTextureCount-Frame-#E2334D" + object: stats.config + trigger: stats.config["textureCPUCount"] + plots: [ + { + prop: "textureCPUCount", + label: "CPU", + color: "#00B4EF" + }, + { + prop: "textureGPUCount", + label: "GPU", + color: "#1AC567" + }, + { + prop: "frameTextureCount", + label: "Frame", + color: "#E2334D" + } + ] } PlotPerf { title: "gpu::Texture Memory" - config: stats.config height: parent.evalEvenHeight() - parameters: "1048576:Mb:1:textureCPUMemoryUsage-CPU-#00B4EF:textureGPUMemoryUsage-GPU-#1AC567" + object: stats.config + trigger: stats.config["textureCPUMemoryUsage"] + valueScale: 1048576 + valueUnit: "Mb" + valueNumDigits: "1" + plots: [ + { + prop: "textureCPUMemoryUsage", + label: "CPU", + color: "#00B4EF" + }, + { + prop: "textureGPUMemoryUsage", + label: "GPU", + color: "#1AC567" + } + ] + } + + PlotPerf { + title: "Triangles" + height: parent.evalEvenHeight() + object: stats.config + trigger: stats.config["frameTriangleCount"] + valueScale: 1000 + valueUnit: "K" + plots: [ + { + prop: "frameTriangleCount", + label: "Frame", + color: "#E2334D" + }, + { + prop: "frameTriangleRate", + label: "rate", + color: "#1AC567", + scale: 0.001, + unit: "MT/s" + } + ] } PlotPerf { title: "Drawcalls" - config: stats.config height: parent.evalEvenHeight() - parameters: "1::0:frameDrawcallCount-frame-#E2334D:frameDrawcallRate-rate-#1AC567-0.001-K/s" + object: stats.config + trigger: stats.config["frameDrawcallCount"] + plots: [ + { + prop: "frameDrawcallCount", + label: "Frame", + color: "#E2334D" + }, + { + prop: "frameDrawcallRate", + label: "rate", + color: "#1AC567", + scale: 0.001, + unit: "K/s" + } + ] } - PlotPerf { - title: "Triangles" - config: stats.config - height: parent.evalEvenHeight() - parameters: "1000:K:0:frameTriangleCount-frame-#E2334D:frameTriangleRate-rate-#1AC567-0.001-MT/s" - } - - property var deferredTaskConfig: Render.getConfig("RenderDeferredTask") - property var drawLightConfig: deferredTaskConfig.getConfig("DrawLight") + + property var drawOpaqueConfig: Render.getConfig("DrawOpaqueDeferred") + property var drawTransparentConfig: Render.getConfig("DrawTransparentDeferred") + property var drawLightConfig: Render.getConfig("DrawLight") PlotPerf { - title: "Lights" - config: parent.drawLightConfig + title: "Items" height: parent.evalEvenHeight() - parameters: "1::0:numDrawn-frame-#E2334D" - } + object: parent.drawOpaqueConfig + trigger: Render.getConfig("DrawOpaqueDeferred")["numDrawn"] + plots: [ + { + object: Render.getConfig("DrawOpaqueDeferred"), + prop: "numDrawn", + label: "Opaques", + color: "#1AC567" + }, + { + object: Render.getConfig("DrawTransparentDeferred"), + prop: "numDrawn", + label: "Translucents", + color: "#00B4EF" + }, + { + object: Render.getConfig("DrawLight"), + prop: "numDrawn", + label: "Lights", + color: "#E2334D" + } + ] + } } } From 62372415bea424007f985be179974b72b7a32358 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 14:01:35 -0700 Subject: [PATCH 50/66] get this working on windows --- libraries/script-engine/src/ScriptEngines.cpp | 2 +- libraries/script-engine/src/ScriptsModel.cpp | 4 +++- libraries/shared/src/PathUtils.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 96e4180704..8ce11a0d4c 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -51,7 +51,7 @@ QUrl normalizeScriptURL(const QUrl& rawScriptURL) { #else // Force lowercase on file scripts because of drive letter weirdness. if (rawScriptURL.isLocalFile()) { - fullNormal.setPath(fullNormal.path.toLower()); + fullNormal.setPath(fullNormal.path().toLower()); } #endif // if this url is something "beneath" the default script url, replace the local path with ~ diff --git a/libraries/script-engine/src/ScriptsModel.cpp b/libraries/script-engine/src/ScriptsModel.cpp index f616847528..9513a333bc 100644 --- a/libraries/script-engine/src/ScriptsModel.cpp +++ b/libraries/script-engine/src/ScriptsModel.cpp @@ -162,10 +162,12 @@ void ScriptsModel::requestDefaultFiles(QString marker) { // QString localDir = url.toLocalFile() + "/scripts"; QString localDir = expandScriptUrl(url).toLocalFile() + "/scripts"; int localDirPartCount = localDir.split("/").size(); + #ifdef Q_OS_WIN + localDirPartCount++; // one for the drive letter + #endif QDirIterator it(localDir, QStringList() << "*.js", QDir::Files, QDirIterator::Subdirectories); while (it.hasNext()) { QUrl jsFullPath = QUrl::fromLocalFile(it.next()); - // QString jsPartialPath = jsFullPath.path().mid(localDir.length() + 1); // + 1 to skip a separator QString jsPartialPath = jsFullPath.path().split("/").mid(localDirPartCount).join("/"); jsFullPath = normalizeScriptURL(jsFullPath); _treeNodes.append(new TreeNodeScript(jsPartialPath, jsFullPath.toString(), SCRIPT_ORIGIN_DEFAULT)); diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 0fe11df28a..31dc9b2ed3 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -57,7 +57,7 @@ QString findMostRecentFileExtension(const QString& originalFileName, QVector Date: Wed, 30 Mar 2016 14:11:36 -0700 Subject: [PATCH 51/66] Get remap textures through getter --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 13942dc282..8134c4d8d7 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -117,12 +117,11 @@ QVariantMap RenderableModelEntityItem::parseTexturesToMap(QString textures) { QJsonParseError error; QJsonDocument texturesJson = QJsonDocument::fromJson(textures.toUtf8(), &error); if (error.error != QJsonParseError::NoError) { - qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << _textures; + qCWarning(entitiesrenderer) << "Could not evaluate textures property value:" << textures; return _originalTextures; } - auto parsed = texturesJson.toVariant(); - return parsed.toMap(); + return texturesJson.toVariant().toMap(); } void RenderableModelEntityItem::remapTextures() { @@ -144,7 +143,7 @@ void RenderableModelEntityItem::remapTextures() { _currentTextures = _originalTextures; } - auto textures = parseTexturesToMap(_textures); + auto textures = parseTexturesToMap(getTextures()); if (textures != _currentTextures) { geometry->setTextures(textures); From 54b8a9278d2d99826f1517b10d954edd8bd89d2b Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 14:11:45 -0700 Subject: [PATCH 52/66] Guard model texs --- libraries/entities/src/ModelEntityItem.cpp | 11 +++++++++++ libraries/entities/src/ModelEntityItem.h | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index bef4406f71..e5511c0b25 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -42,6 +42,17 @@ ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID) : EntityItem( _color[0] = _color[1] = _color[2] = 0; } +const QString ModelEntityItem::getTextures() const { + QReadLocker locker(&_texturesLock); + auto textures = _textures; + return textures; +} + +void ModelEntityItem::setTextures(const QString& textures) { + QWriteLocker locker(&_texturesLock); + _textures = textures; +} + EntityItemProperties ModelEntityItem::getProperties(EntityPropertyFlags desiredProperties) const { EntityItemProperties properties = EntityItem::getProperties(desiredProperties); // get the properties from our base class COPY_ENTITY_PROPERTY_TO_PROPERTIES(color, getXColor); diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h index bce27f1cca..d0e0909b27 100644 --- a/libraries/entities/src/ModelEntityItem.h +++ b/libraries/entities/src/ModelEntityItem.h @@ -110,8 +110,8 @@ public: float getAnimationFPS() const { return _animationLoop.getFPS(); } static const QString DEFAULT_TEXTURES; - const QString& getTextures() const { return _textures; } - void setTextures(const QString& textures) { _textures = textures; } + const QString getTextures() const; + void setTextures(const QString& textures); virtual bool shouldBePhysical() const; @@ -159,7 +159,9 @@ protected: AnimationPropertyGroup _animationProperties; AnimationLoop _animationLoop; + mutable QReadWriteLock _texturesLock; QString _textures; + ShapeType _shapeType = SHAPE_TYPE_NONE; // used on client side From 103257493c801ecd9715e5950a49bfe76df754f9 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 30 Mar 2016 14:24:28 -0700 Subject: [PATCH 53/66] Model: fix for crash when displaying collision mesh. This was due to a default constructed PayloadPointer being sent to the scene via resetItem. The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens. --- libraries/render-utils/src/Model.cpp | 2 +- libraries/render/src/render/Scene.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 8d59d5f736..83433d24cb 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -536,7 +536,7 @@ void Model::setVisibleInScene(bool newValue, std::shared_ptr scen pendingChanges.resetItem(item, _modelMeshRenderItems[item]); } foreach (auto item, _collisionRenderItems.keys()) { - pendingChanges.resetItem(item, _modelMeshRenderItems[item]); + pendingChanges.resetItem(item, _collisionRenderItems[item]); } scene->enqueuePendingChanges(pendingChanges); } diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp index 79f4b2a269..e091b4842c 100644 --- a/libraries/render/src/render/Scene.cpp +++ b/libraries/render/src/render/Scene.cpp @@ -16,8 +16,13 @@ using namespace render; void PendingChanges::resetItem(ItemID id, const PayloadPointer& payload) { - _resetItems.push_back(id); - _resetPayloads.push_back(payload); + if (payload) { + _resetItems.push_back(id); + _resetPayloads.push_back(payload); + } else { + qDebug() << "WARNING: PendingChanges::resetItem with a null payload!"; + removeItem(id); + } } void PendingChanges::removeItem(ItemID id) { From b6bf392f94ba50239522a4dc4bd40cf58e2666f8 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 14:39:35 -0700 Subject: [PATCH 54/66] Defer avatar URL change to render thread --- interface/src/avatar/Avatar.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 056b5b76c4..3417011051 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -859,7 +859,11 @@ void Avatar::scaleVectorRelativeToPosition(glm::vec3 &positionToScale) const { void Avatar::setSkeletonModelURL(const QUrl& skeletonModelURL) { AvatarData::setSkeletonModelURL(skeletonModelURL); - _skeletonModel->setURL(_skeletonModelURL); + if (QThread::currentThread() == thread()) { + _skeletonModel->setURL(_skeletonModelURL); + } else { + QMetaObject::invokeMethod(_skeletonModel.get(), "setURL", Qt::QueuedConnection, Q_ARG(QUrl, _skeletonModelURL)); + } } // create new model, can return an instance of a SoftAttachmentModel rather then Model From b6853a0679d64aff3afaae02dbae400981087a98 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 14:47:40 -0700 Subject: [PATCH 55/66] fix packaged server console folder for OS X --- server-console/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt index 9a96b07442..1c6e40c582 100644 --- a/server-console/CMakeLists.txt +++ b/server-console/CMakeLists.txt @@ -23,7 +23,7 @@ add_dependencies(${TARGET_NAME} assignment-client domain-server) # set the packaged console folder depending on platform, so we can copy it if (APPLE) - set(PACKAGED_CONSOLE_FOLDER "Server\\ Console-darwin-x64/${CONSOLE_EXEC_NAME}") + set(PACKAGED_CONSOLE_FOLDER "Sandbox-darwin-x64/${CONSOLE_EXEC_NAME}") elseif (WIN32) set(PACKAGED_CONSOLE_FOLDER "server-console-win32-x64") elseif (UNIX) From 01db2be6b8c0cc0b4fe9843f5b6d795fd1c008b6 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 14:48:57 -0700 Subject: [PATCH 56/66] Avoid JSON parsing texs every render cycle --- .../src/RenderableModelEntityItem.cpp | 14 ++++++++++---- .../src/RenderableModelEntityItem.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 8134c4d8d7..e18f85211f 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -143,11 +143,17 @@ void RenderableModelEntityItem::remapTextures() { _currentTextures = _originalTextures; } - auto textures = parseTexturesToMap(getTextures()); + auto textures = getTextures(); + if (textures == _lastTextures) { + return; + } - if (textures != _currentTextures) { - geometry->setTextures(textures); - _currentTextures = textures; + _lastTextures = textures; + auto newTextures = parseTexturesToMap(textures); + + if (newTextures != _currentTextures) { + geometry->setTextures(newTextures); + _currentTextures = newTextures; } } diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h index e88b239e41..6d40a80950 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.h +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h @@ -90,6 +90,7 @@ private: bool _needsInitialSimulation = true; bool _needsModelReload = true; EntityTreeRenderer* _myRenderer = nullptr; + QString _lastTextures; QVariantMap _currentTextures; QVariantMap _originalTextures; bool _originalTexturesRead = false; From e8f26b675a2f2e20e6e730ddf5a3acf8668dfcbd Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 15:04:29 -0700 Subject: [PATCH 57/66] try to fix path to osx scripts --- libraries/shared/src/PathUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/shared/src/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp index 31dc9b2ed3..410a95a4d5 100644 --- a/libraries/shared/src/PathUtils.cpp +++ b/libraries/shared/src/PathUtils.cpp @@ -59,7 +59,7 @@ QUrl defaultScriptsLocation() { #ifdef Q_OS_WIN return QUrl(("file:///" + QCoreApplication::applicationDirPath()).toLower()); #elif defined(Q_OS_OSX) - return QUrl(("file://" + QCoreApplication::applicationDirPath() + "/../..").toLower()); + return QUrl(("file://" + QCoreApplication::applicationDirPath() + "/../Resources").toLower()); #else // return "http://s3.amazonaws.com/hifi-public"; return QUrl("file://" + QCoreApplication::applicationDirPath()); From 6213e0859d357bc11e99ff6fb7037fb35a5f15c2 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 30 Mar 2016 15:07:45 -0700 Subject: [PATCH 58/66] Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned --- examples/utilities/render/stats.qml | 17 +++++++++++------ libraries/gpu/src/gpu/Context.h | 1 + libraries/gpu/src/gpu/GLBackend.cpp | 8 +++++++- libraries/render/src/render/EngineStats.cpp | 1 + libraries/render/src/render/EngineStats.h | 2 ++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/examples/utilities/render/stats.qml b/examples/utilities/render/stats.qml index 6326910220..0e51cb8834 100644 --- a/examples/utilities/render/stats.qml +++ b/examples/utilities/render/stats.qml @@ -122,13 +122,13 @@ Item { plots: [ { prop: "frameTriangleCount", - label: "Frame", - color: "#E2334D" + label: "Triangles", + color: "#1AC567" }, { prop: "frameTriangleRate", label: "rate", - color: "#1AC567", + color: "#E2334D", scale: 0.001, unit: "MT/s" } @@ -140,15 +140,20 @@ Item { object: stats.config trigger: stats.config["frameDrawcallCount"] plots: [ + { + prop: "frameAPIDrawcallCount", + label: "API Drawcalls", + color: "#00B4EF" + }, { prop: "frameDrawcallCount", - label: "Frame", - color: "#E2334D" + label: "GPU Drawcalls", + color: "#1AC567" }, { prop: "frameDrawcallRate", label: "rate", - color: "#1AC567", + color: "#E2334D", scale: 0.001, unit: "K/s" } diff --git a/libraries/gpu/src/gpu/Context.h b/libraries/gpu/src/gpu/Context.h index b898bddef9..7f442895a5 100644 --- a/libraries/gpu/src/gpu/Context.h +++ b/libraries/gpu/src/gpu/Context.h @@ -35,6 +35,7 @@ public: int _RSNumTextureBounded = 0; + int _DSNumAPIDrawcalls = 0; int _DSNumDrawcalls = 0; int _DSNumTriangles = 0; diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp index e847ad1a42..b5b6437ed8 100644 --- a/libraries/gpu/src/gpu/GLBackend.cpp +++ b/libraries/gpu/src/gpu/GLBackend.cpp @@ -326,6 +326,7 @@ void GLBackend::do_draw(Batch& batch, size_t paramOffset) { glDrawArrays(mode, startVertex, numVertices); _stats._DSNumTriangles += numVertices / 3; _stats._DSNumDrawcalls++; + _stats._DSNumAPIDrawcalls++; (void)CHECK_GL_ERROR(); } @@ -344,6 +345,7 @@ void GLBackend::do_drawIndexed(Batch& batch, size_t paramOffset) { glDrawElements(mode, numIndices, glType, indexBufferByteOffset); _stats._DSNumTriangles += numIndices / 3; _stats._DSNumDrawcalls++; + _stats._DSNumAPIDrawcalls++; (void) CHECK_GL_ERROR(); } @@ -358,6 +360,7 @@ void GLBackend::do_drawInstanced(Batch& batch, size_t paramOffset) { glDrawArraysInstancedARB(mode, startVertex, numVertices, numInstances); _stats._DSNumTriangles += (numInstances * numVertices) / 3; _stats._DSNumDrawcalls += numInstances; + _stats._DSNumAPIDrawcalls++; (void) CHECK_GL_ERROR(); } @@ -383,6 +386,7 @@ void GLBackend::do_drawIndexedInstanced(Batch& batch, size_t paramOffset) { #endif _stats._DSNumTriangles += (numInstances * numIndices) / 3; _stats._DSNumDrawcalls += numInstances; + _stats._DSNumAPIDrawcalls++; (void)CHECK_GL_ERROR(); } @@ -395,6 +399,8 @@ void GLBackend::do_multiDrawIndirect(Batch& batch, size_t paramOffset) { glMultiDrawArraysIndirect(mode, reinterpret_cast(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride); _stats._DSNumDrawcalls += commandCount; + _stats._DSNumAPIDrawcalls++; + #else // FIXME implement the slow path #endif @@ -410,7 +416,7 @@ void GLBackend::do_multiDrawIndexedIndirect(Batch& batch, size_t paramOffset) { glMultiDrawElementsIndirect(mode, indexType, reinterpret_cast(_input._indirectBufferOffset), commandCount, (GLsizei)_input._indirectBufferStride); _stats._DSNumDrawcalls += commandCount; - + _stats._DSNumAPIDrawcalls++; #else // FIXME implement the slow path #endif diff --git a/libraries/render/src/render/EngineStats.cpp b/libraries/render/src/render/EngineStats.cpp index ee96e0cd86..794f278fcf 100644 --- a/libraries/render/src/render/EngineStats.cpp +++ b/libraries/render/src/render/EngineStats.cpp @@ -36,6 +36,7 @@ void EngineStats::run(const SceneContextPointer& sceneContext, const RenderConte gpu::ContextStats gpuStats(_gpuStats); renderContext->args->_context->getStats(_gpuStats); + config->frameAPIDrawcallCount = _gpuStats._DSNumAPIDrawcalls - gpuStats._DSNumAPIDrawcalls; config->frameDrawcallCount = _gpuStats._DSNumDrawcalls - gpuStats._DSNumDrawcalls; config->frameDrawcallRate = config->frameDrawcallCount * frequency; diff --git a/libraries/render/src/render/EngineStats.h b/libraries/render/src/render/EngineStats.h index 478d94855e..4a57724644 100644 --- a/libraries/render/src/render/EngineStats.h +++ b/libraries/render/src/render/EngineStats.h @@ -34,6 +34,7 @@ namespace render { Q_PROPERTY(qint64 textureCPUMemoryUsage MEMBER textureCPUMemoryUsage NOTIFY dirty) Q_PROPERTY(qint64 textureGPUMemoryUsage MEMBER textureGPUMemoryUsage NOTIFY dirty) + Q_PROPERTY(quint32 frameAPIDrawcallCount MEMBER frameAPIDrawcallCount NOTIFY dirty) Q_PROPERTY(quint32 frameDrawcallCount MEMBER frameDrawcallCount NOTIFY dirty) Q_PROPERTY(quint32 frameDrawcallRate MEMBER frameDrawcallRate NOTIFY dirty) @@ -57,6 +58,7 @@ namespace render { qint64 textureCPUMemoryUsage{ 0 }; qint64 textureGPUMemoryUsage{ 0 }; + quint32 frameAPIDrawcallCount{ 0 }; quint32 frameDrawcallCount{ 0 }; quint32 frameDrawcallRate{ 0 }; From 530cb40528a6fac2fe449bdb3932e443944edf57 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 15:11:54 -0700 Subject: [PATCH 59/66] Check for valid qml gl context creation --- libraries/gl/src/gl/OffscreenGLCanvas.cpp | 4 +++- libraries/gl/src/gl/OffscreenQmlSurface.cpp | 13 ++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp index 31bbc84cb2..8e5579f90b 100644 --- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp +++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp @@ -38,11 +38,13 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) { _context->setShareContext(sharedContext); } _context->setFormat(getDefaultOpenGLSurfaceFormat()); + if (_context->create()) { _offscreenSurface->setFormat(_context->format()); _offscreenSurface->create(); - return true; + return _offscreenSurface->isValid(); } + qWarning("Failed to create OffscreenGLCanvas context"); return false; } diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp index 1d9e6d0149..1d7824f789 100644 --- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp +++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp @@ -134,14 +134,13 @@ QEvent* OffscreenQmlRenderThread::Queue::take() { } OffscreenQmlRenderThread::OffscreenQmlRenderThread(OffscreenQmlSurface* surface, QOpenGLContext* shareContext) : _surface(surface) { - qDebug() << "Building QML Renderer: creating context"; + qDebug() << "Building QML Renderer"; if (!_canvas.create(shareContext)) { - static const char* error = "Failed to create OffscreenGLCanvas"; - qWarning() << error; - throw error; + qWarning("Failed to create OffscreenGLCanvas"); + _quit = true; + return; }; - qDebug() << "Building QML Renderer: creating render control"; _renderControl = new QMyQuickRenderControl(); QQuickWindow::setDefaultAlphaBuffer(true); // Create a QQuickWindow that is associated with our render control. @@ -149,19 +148,15 @@ OffscreenQmlRenderThread::OffscreenQmlRenderThread(OffscreenQmlSurface* surface, // NOTE: Must be created on the main thread so that OffscreenQmlSurface can send it events // NOTE: Must be created on the rendering thread or it will refuse to render, // so we wait until after its ctor to move object/context to this thread. - qDebug() << "Building QML Renderer: creating window"; _quickWindow = new QQuickWindow(_renderControl); _quickWindow->setColor(QColor(255, 255, 255, 0)); _quickWindow->setFlags(_quickWindow->flags() | static_cast(Qt::WA_TranslucentBackground)); // We can prepare, but we must wait to start() the thread until after the ctor - qDebug() << "Building QML Renderer: moving to own thread"; _renderControl->prepareThread(this); _canvas.getContextObject()->moveToThread(this); moveToThread(this); - qDebug() << "Building QML Renderer: complete"; - _queue.add(INIT); } From f6344c34e7b5a67527c9ef282d2a2246904df2a3 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 30 Mar 2016 15:19:35 -0700 Subject: [PATCH 60/66] Model: Fix for equipped models not updating their matrices --- libraries/render-utils/src/Model.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 8d59d5f736..078a64405c 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -131,6 +131,8 @@ void Model::setOffset(const glm::vec3& offset) { void Model::enqueueLocationChange() { + _needsUpdateClusterMatrices = true; + // queue up this work for later processing, at the end of update and just before rendering. // the application will ensure only the last lambda is actually invoked. void* key = (void*)this; From 02273e067a5eb83127b8e218cc981d766d3d1905 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 10:28:37 -0700 Subject: [PATCH 61/66] Add GL checks --- libraries/gpu/src/gpu/GLBackendState.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/gpu/src/gpu/GLBackendState.cpp b/libraries/gpu/src/gpu/GLBackendState.cpp index 64bd87c876..eeac5e1038 100644 --- a/libraries/gpu/src/gpu/GLBackendState.cpp +++ b/libraries/gpu/src/gpu/GLBackendState.cpp @@ -609,6 +609,8 @@ void GLBackend::do_setStateDepthBias(Vec2 bias) { glDisable(GL_POLYGON_OFFSET_LINE); glDisable(GL_POLYGON_OFFSET_POINT); } + (void) CHECK_GL_ERROR(); + _pipeline._stateCache.depthBias = bias.x; _pipeline._stateCache.depthBiasSlopeScale = bias.y; } @@ -689,6 +691,7 @@ void GLBackend::do_setStateAlphaToCoverageEnable(bool enable) { glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); } (void) CHECK_GL_ERROR(); + _pipeline._stateCache.alphaToCoverageEnable = enable; } } @@ -702,6 +705,7 @@ void GLBackend::do_setStateSampleMask(uint32 mask) { glEnable(GL_SAMPLE_MASK); glSampleMaski(0, mask); } + (void) CHECK_GL_ERROR(); #endif _pipeline._stateCache.sampleMask = mask; } @@ -742,10 +746,10 @@ void GLBackend::do_setStateBlend(State::BlendFunction function) { glBlendFuncSeparate(BLEND_ARGS[function.getSourceColor()], BLEND_ARGS[function.getDestinationColor()], BLEND_ARGS[function.getSourceAlpha()], BLEND_ARGS[function.getDestinationAlpha()]); - (void) CHECK_GL_ERROR(); } else { glDisable(GL_BLEND); } + (void) CHECK_GL_ERROR(); _pipeline._stateCache.blendFunction = function; } @@ -757,6 +761,7 @@ void GLBackend::do_setStateColorWriteMask(uint32 mask) { mask & State::ColorMask::WRITE_GREEN, mask & State::ColorMask::WRITE_BLUE, mask & State::ColorMask::WRITE_ALPHA ); + (void) CHECK_GL_ERROR(); _pipeline._stateCache.colorWriteMask = mask; } @@ -764,7 +769,6 @@ void GLBackend::do_setStateColorWriteMask(uint32 mask) { void GLBackend::do_setStateBlendFactor(Batch& batch, size_t paramOffset) { - Vec4 factor(batch._params[paramOffset + 0]._float, batch._params[paramOffset + 1]._float, batch._params[paramOffset + 2]._float, From 00db0953067a4408344c8438fc608c5a732c2e32 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 15:49:45 -0700 Subject: [PATCH 62/66] Guard against reset model geo on scene update --- libraries/render-utils/src/Model.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 8d59d5f736..1418329fcb 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -165,13 +165,15 @@ void Model::enqueueLocationChange() { render::PendingChanges pendingChanges; foreach (auto itemID, self->_modelMeshRenderItems.keys()) { pendingChanges.updateItem(itemID, [modelTransform, modelMeshOffset](ModelMeshPartPayload& data) { + // Ensure the model geometry was not reset between frames + if (data._model->isLoaded()) { + // lazy update of cluster matrices used for rendering. We need to update them here, so we can correctly update the bounding box. + data._model->updateClusterMatrices(modelTransform.getTranslation(), modelTransform.getRotation()); - // lazy update of cluster matrices used for rendering. We need to update them here, so we can correctly update the bounding box. - data._model->updateClusterMatrices(modelTransform.getTranslation(), modelTransform.getRotation()); - - // update the model transform and bounding box for this render item. - const Model::MeshState& state = data._model->_meshStates.at(data._meshIndex); - data.updateTransformForSkinnedMesh(modelTransform, modelMeshOffset, state.clusterMatrices); + // update the model transform and bounding box for this render item. + const Model::MeshState& state = data._model->_meshStates.at(data._meshIndex); + data.updateTransformForSkinnedMesh(modelTransform, modelMeshOffset, state.clusterMatrices); + } }); } From 6e0d6ee45bdb2a609f7fb51cce7605e8a9537eff Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 30 Mar 2016 16:04:00 -0700 Subject: [PATCH 63/66] Guard updateClusterMatrices from unloaded geo --- libraries/render-utils/src/Model.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 1418329fcb..33f12d0b53 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1061,7 +1061,7 @@ void Model::simulateInternal(float deltaTime) { void Model::updateClusterMatrices(glm::vec3 modelPosition, glm::quat modelOrientation) { PerformanceTimer perfTimer("Model::updateClusterMatrices"); - if (!_needsUpdateClusterMatrices) { + if (!_needsUpdateClusterMatrices || !isLoaded()) { return; } _needsUpdateClusterMatrices = false; From f4d834b07b31ee241e926aa1ee3f17b0f2e9ef3d Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Wed, 30 Mar 2016 16:15:29 -0700 Subject: [PATCH 64/66] OctreeTests: added unit tests for EntityTreeElement child accessors --- tests/octree/src/OctreeTests.cpp | 32 ++++++++++++++++++++++++++++++++ tests/octree/src/OctreeTests.h | 2 ++ 2 files changed, 34 insertions(+) diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp index ef08855d06..64d68e8e13 100644 --- a/tests/octree/src/OctreeTests.cpp +++ b/tests/octree/src/OctreeTests.cpp @@ -795,3 +795,35 @@ void OctreeTests::modelItemTests() { #endif } +void OctreeTests::elementAddChildTests() { + EntityTreePointer tree = std::make_shared(); + auto elem = tree->createNewElement(); + QCOMPARE((bool)elem->getChildAtIndex(0), false); + elem->addChildAtIndex(0); + QCOMPARE((bool)elem->getChildAtIndex(0), true); + + const int MAX_CHILD_INDEX = 8; + for (int i = 0; i < MAX_CHILD_INDEX; i++) { + for (int j = 0; j < MAX_CHILD_INDEX; j++) { + auto e = tree->createNewElement(); + + // add a single child. + auto firstChild = e->addChildAtIndex(i); + QCOMPARE(e->getChildAtIndex(i), firstChild); + + if (i != j) { + // add a second child. + auto secondChild = e->addChildAtIndex(j); + QCOMPARE(e->getChildAtIndex(i), firstChild); + QCOMPARE(e->getChildAtIndex(j), secondChild); + + // remove scecond child. + e->removeChildAtIndex(j); + + QCOMPARE((bool)e->getChildAtIndex(j), false); + } + + QCOMPARE(e->getChildAtIndex(i), firstChild); + } + } +} diff --git a/tests/octree/src/OctreeTests.h b/tests/octree/src/OctreeTests.h index c0e989805a..b236ab08c9 100644 --- a/tests/octree/src/OctreeTests.h +++ b/tests/octree/src/OctreeTests.h @@ -25,6 +25,8 @@ private slots: // This test is fine void modelItemTests(); + void elementAddChildTests(); + // TODO: Break these into separate test functions }; From d8b0dbf3bf8058c7ae0f85f18638fc64eb47c593 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 30 Mar 2016 16:58:35 -0700 Subject: [PATCH 65/66] fix indentation for last inactive check timestamp --- ice-server/src/IceServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index 9d1bb58ddf..a512d5a049 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -35,7 +35,7 @@ IceServer::IceServer(int argc, char* argv[]) : _serverSocket(), _activePeers(), _httpManager(QHostAddress::AnyIPv4, ICE_SERVER_MONITORING_PORT, QString("%1/web/").arg(QCoreApplication::applicationDirPath()), this), - _lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch()) + _lastInactiveCheckTimestamp(QDateTime::currentMSecsSinceEpoch()) { // start the ice-server socket qDebug() << "ice-server socket is listening on" << ICE_SERVER_DEFAULT_PORT; From 651d2c89542fb76ad807f9856a38eaaf86f6417e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 17:27:36 -0700 Subject: [PATCH 66/66] fix script load from disk on windows --- libraries/script-engine/src/ScriptEngines.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 0a4b1a168b..16301dc890 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -397,7 +397,18 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL Q_ARG(bool, reload)); return result; } - QUrl scriptUrl = normalizeScriptURL(scriptFilename); + QUrl scriptUrl; + if (!scriptFilename.isValid() || + (scriptFilename.scheme() != "http" && + scriptFilename.scheme() != "https" && + scriptFilename.scheme() != "atp" && + scriptFilename.scheme() != "file")) { + // deal with a "url" like c:/something + scriptUrl = normalizeScriptURL(QUrl::fromLocalFile(scriptFilename.toString())); + } else { + scriptUrl = normalizeScriptURL(scriptFilename); + } + auto scriptEngine = getScriptEngine(scriptUrl.toString()); if (scriptEngine) { return scriptEngine;