From bfbded7beca85e58c1b87801f715d3cee678f027 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Fri, 27 Apr 2018 16:57:24 -0700 Subject: [PATCH 1/4] Reset pending domain checkins in more locations --- libraries/networking/src/DomainHandler.cpp | 3 +++ libraries/networking/src/DomainHandler.h | 2 +- libraries/networking/src/NodeList.cpp | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index cd8064c4c0..84af21004d 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -239,6 +239,7 @@ void DomainHandler::activateICELocalSocket() { _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); + clearPendingCheckins(); // Clear outstanding count. } void DomainHandler::activateICEPublicSocket() { @@ -248,6 +249,7 @@ void DomainHandler::activateICEPublicSocket() { _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); + clearPendingCheckins(); // Clear outstanding count. } QString DomainHandler::getViewPointFromNamedPath(QString namedPath) { @@ -339,6 +341,7 @@ void DomainHandler::processSettingsPacketList(QSharedPointer pa qCDebug(networking) << "Received domain settings: \n" << _settingsObject; } + clearPendingCheckins(); // Reset outstanding check-ins. emit settingsReceived(_settingsObject); } diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 2d4712209d..08908dbaf6 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -97,7 +97,7 @@ public: int getCheckInPacketsSinceLastReply() const { return _checkInPacketsSinceLastReply; } void sentCheckInPacket(); - void domainListReceived() { _checkInPacketsSinceLastReply = 0; } + void clearPendingCheckins() { _checkInPacketsSinceLastReply = 0; } /**jsdoc *

The reasons that you may be refused connection to a domain are defined by numeric values:

diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 04e32f50cb..9d3e5f0e91 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -534,6 +534,8 @@ void NodeList::processDomainServerPathResponse(QSharedPointer m qCDebug(networking) << "Could not go to viewpoint" << viewpoint << "which was the lookup result for path" << pathQuery; } + + _domainHandler.clearPendingCheckins(); } void NodeList::handleICEConnectionToDomainServer() { @@ -594,6 +596,8 @@ void NodeList::processDomainServerConnectionTokenPacket(QSharedPointerreadWithoutCopy(NUM_BYTES_RFC4122_UUID))); + + _domainHandler.clearPendingCheckins(); sendDomainServerCheckIn(); } @@ -605,7 +609,7 @@ void NodeList::processDomainServerList(QSharedPointer message) } // this is a packet from the domain server, reset the count of un-replied check-ins - _domainHandler.domainListReceived(); + _domainHandler.clearPendingCheckins(); // emit our signal so listeners know we just heard from the DS emit receivedDomainServerList(); From cfc5892d63f342949bf886dc45e99e07809aa0db Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Mon, 30 Apr 2018 13:41:56 -0700 Subject: [PATCH 2/4] Only clear check-in count on Domain Query related responses --- libraries/networking/src/DomainHandler.cpp | 3 --- libraries/networking/src/NodeList.cpp | 2 -- 2 files changed, 5 deletions(-) diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index 84af21004d..cd8064c4c0 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -239,7 +239,6 @@ void DomainHandler::activateICELocalSocket() { _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); - clearPendingCheckins(); // Clear outstanding count. } void DomainHandler::activateICEPublicSocket() { @@ -249,7 +248,6 @@ void DomainHandler::activateICEPublicSocket() { _domainURL.setHost(_sockAddr.getAddress().toString()); emit domainURLChanged(_domainURL); emit completedSocketDiscovery(); - clearPendingCheckins(); // Clear outstanding count. } QString DomainHandler::getViewPointFromNamedPath(QString namedPath) { @@ -341,7 +339,6 @@ void DomainHandler::processSettingsPacketList(QSharedPointer pa qCDebug(networking) << "Received domain settings: \n" << _settingsObject; } - clearPendingCheckins(); // Reset outstanding check-ins. emit settingsReceived(_settingsObject); } diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 9d3e5f0e91..4920ea97c7 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -534,8 +534,6 @@ void NodeList::processDomainServerPathResponse(QSharedPointer m qCDebug(networking) << "Could not go to viewpoint" << viewpoint << "which was the lookup result for path" << pathQuery; } - - _domainHandler.clearPendingCheckins(); } void NodeList::handleICEConnectionToDomainServer() { From fab85c3f6d433940d7c503d3a103317447300593 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 11 May 2018 09:52:48 +1200 Subject: [PATCH 3/4] Fix JSDoc function definitions specifying properties instead of params --- .../entities/src/EntityScriptingInterface.h | 4 +- .../src/AssetScriptingInterface.h | 58 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 8adb5138f2..7e47d9e2d4 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -481,8 +481,8 @@ public slots: /**jsdoc * Gets the status of server entity script attached to an entity * @function Entities.getServerScriptStatus - * @property {Uuid} entityID - The ID of the entity to get the server entity script status for. - * @property {Entities~getServerScriptStatusCallback} callback - The function to call upon completion. + * @param {Uuid} entityID - The ID of the entity to get the server entity script status for. + * @param {Entities~getServerScriptStatusCallback} callback - The function to call upon completion. * @returns {boolean} true always. */ /**jsdoc diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h index eb9a628ae3..7f7a3a68b0 100644 --- a/libraries/script-engine/src/AssetScriptingInterface.h +++ b/libraries/script-engine/src/AssetScriptingInterface.h @@ -186,36 +186,36 @@ public: /**jsdoc * @function Assets.deleteAsset - * @property {} options - * @property {} scope - * @property {} [callback = ""] + * @param {} options + * @param {} scope + * @param {} [callback = ""] */ Q_INVOKABLE void deleteAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.resolveAsset - * @property {} options - * @property {} scope - * @property {} [callback = ""] + * @param {} options + * @param {} scope + * @param {} [callback = ""] */ Q_INVOKABLE void resolveAsset(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.decompressData - * @property {} options - * @property {} scope - * @property {} [callback = ""] + * @param {} options + * @param {} scope + * @param {} [callback = ""] */ Q_INVOKABLE void decompressData(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.compressData - * @property {} options - * @property {} scope - * @property {} [callback = ""] + * @param {} options + * @param {} scope + * @param {} [callback = ""] */ Q_INVOKABLE void compressData(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); @@ -229,7 +229,7 @@ public: /**jsdoc * @function Assets.canWriteCacheValue - * @property {string} url + * @param {string} url * @returns {boolean} */ @@ -237,8 +237,8 @@ public: /**jsdoc * @function Assets.getCacheStatus - * @property {} scope - * @property {} [callback=undefined] + * @param {} scope + * @param {} [callback=undefined] */ Q_INVOKABLE void getCacheStatus(QScriptValue scope, QScriptValue callback = QScriptValue()) { @@ -247,38 +247,38 @@ public: /**jsdoc * @function Assets.queryCacheMeta - * @property {} options - * @property {} scope - * @property {} [callback=undefined] + * @param {} options + * @param {} scope + * @param {} [callback=undefined] */ Q_INVOKABLE void queryCacheMeta(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.loadFromCache - * @property {} options - * @property {} scope - * @property {} [callback=undefined] + * @param {} options + * @param {} scope + * @param {} [callback=undefined] */ Q_INVOKABLE void loadFromCache(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.saveToCache - * @property {} options - * @property {} scope - * @property {} [callback=undefined] + * @param {} options + * @param {} scope + * @param {} [callback=undefined] */ Q_INVOKABLE void saveToCache(QScriptValue options, QScriptValue scope, QScriptValue callback = QScriptValue()); /**jsdoc * @function Assets.saveToCache - * @property {} url - * @property {} data - * @property {} metadata - * @property {} scope - * @property {} [callback=undefined] + * @param {} url + * @param {} data + * @param {} metadata + * @param {} scope + * @param {} [callback=undefined] */ Q_INVOKABLE void saveToCache(const QUrl& url, const QByteArray& data, const QVariantMap& metadata, From 85a6e2555fcec45ce812fd898088913b1e206089 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 11 May 2018 13:55:29 -0700 Subject: [PATCH 4/4] don't assert when unserializing a 'spring' action --- libraries/physics/src/ObjectActionTractor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/ObjectActionTractor.cpp b/libraries/physics/src/ObjectActionTractor.cpp index a48989be33..4235bbd616 100644 --- a/libraries/physics/src/ObjectActionTractor.cpp +++ b/libraries/physics/src/ObjectActionTractor.cpp @@ -397,7 +397,7 @@ void ObjectActionTractor::deserialize(QByteArray serializedArguments) { EntityDynamicType type; dataStream >> type; - assert(type == getType()); + assert(type == getType() || type == DYNAMIC_TYPE_SPRING); QUuid id; dataStream >> id;