Merge branch 'master' of https://github.com/highfidelity/hifi

assignment-client/src/Agent.cpp

@@ -92,6 +92,9 @@ void Agent::run() {
     
     loop.exec();
     
+    // let the AvatarData class use our QNetworkAcessManager
+    AvatarData::setNetworkAccessManager(networkManager);
+    
     QString scriptContents(reply->readAll());
     
     qDebug() << "Downloaded script:" << scriptContents;

examples/bot.js

@@ -50,5 +50,6 @@ if (botNumber <= 20) {
 // there is no need to change the body model - we're using the default
 Avatar.faceModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newFaceFilePrefix + ".fst";
 Avatar.skeletonModelURL = "https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/" + newBodyFilePrefix + ".fst";
+Avatar.billboardURL = "https://dl.dropboxusercontent.com/u/1864924/bot-billboard.png";
 
 Agent.isAvatar = true;

interface/src/Application.cpp

@@ -227,6 +227,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
     connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
     connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
     connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle);
+    connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
    
     // connect to appropriate slots on AccountManager
     AccountManager& accountManager = AccountManager::getInstance();

libraries/audio/src/Sound.cpp

@@ -44,13 +44,8 @@ void Sound::replyFinished(QNetworkReply* reply) {
 
         QByteArray headerContentType = reply->rawHeader("Content-Type");
 
-        // RAW audio file encountered
-        if (headerContentType == "application/octet-stream") {
-            downSample(rawAudioByteArray);
-        }
-
         // WAV audio file encountered
-        else if (headerContentType == "audio/x-wav"
+        if (headerContentType == "audio/x-wav"
             || headerContentType == "audio/wav"
             || headerContentType == "audio/wave") {
 
@@ -59,7 +54,8 @@ void Sound::replyFinished(QNetworkReply* reply) {
             interpretAsWav(rawAudioByteArray, outputAudioByteArray);
             downSample(outputAudioByteArray);
         } else {
-            qDebug() << "Unknown audio file 'Content-Type'.";
+            //  Process as RAW file
+            downSample(rawAudioByteArray);
         }
     } else {
         qDebug() << "Network reply without 'Content-Type'.";

libraries/avatars/src/AvatarData.cpp

@@ -11,6 +11,9 @@
 #include <stdint.h>
 
 #include <QtCore/QDataStream>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
 
 #include <NodeList.h>
 #include <PacketHeaders.h>
@@ -24,6 +27,8 @@ using namespace std;
 
 static const float fingerVectorRadix = 4; // bits of precision when converting from float<->fixed
 
+QNetworkAccessManager* AvatarData::networkAccessManager = NULL;
+
 AvatarData::AvatarData() :
     NodeData(),
     _handPosition(0,0,0),
@@ -38,7 +43,8 @@ AvatarData::AvatarData() :
     _handData(NULL), 
     _displayNameBoundingRect(), 
     _displayNameTargetAlpha(0.0f), 
-    _displayNameAlpha(0.0f)
+    _displayNameAlpha(0.0f),
+    _billboard()
 {
     
 }
@@ -338,6 +344,28 @@ void AvatarData::setBillboard(const QByteArray& billboard) {
     qDebug() << "Changing billboard for avatar.";
 }
 
+void AvatarData::setBillboardFromURL(const QString &billboardURL) {
+    _billboardURL = billboardURL;
+    
+    if (AvatarData::networkAccessManager) {
+        qDebug() << "Changing billboard for avatar to PNG at" << qPrintable(billboardURL);
+        
+        QNetworkRequest billboardRequest;
+        billboardRequest.setUrl(QUrl(billboardURL));
+        
+        QNetworkReply* networkReply = AvatarData::networkAccessManager->get(billboardRequest);
+        connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
+        
+    } else {
+        qDebug() << "Billboard PNG download requested but no network access manager is available.";
+    }
+}
+
+void AvatarData::setBillboardFromNetworkReply() {
+    QNetworkReply* networkReply = reinterpret_cast<QNetworkReply*>(sender());
+    setBillboard(networkReply->readAll());
+}
+
 void AvatarData::setClampedTargetScale(float targetScale) {
     
     targetScale =  glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
@@ -361,8 +389,10 @@ void AvatarData::sendIdentityPacket() {
 }
 
 void AvatarData::sendBillboardPacket() {
-    QByteArray billboardPacket = byteArrayWithPopulatedHeader(PacketTypeAvatarBillboard);
-    billboardPacket.append(_billboard);
-    
-    NodeList::getInstance()->broadcastToNodes(billboardPacket, NodeSet() << NodeType::AvatarMixer);
+    if (!_billboard.isEmpty()) {
+        QByteArray billboardPacket = byteArrayWithPopulatedHeader(PacketTypeAvatarBillboard);
+        billboardPacket.append(_billboard);
+        
+        NodeList::getInstance()->broadcastToNodes(billboardPacket, NodeSet() << NodeType::AvatarMixer);
+    }
 }

libraries/avatars/src/AvatarData.h

@@ -68,6 +68,8 @@ enum KeyState {
 
 const glm::vec3 vec3Zero(0.0f);
 
+class QNetworkAccessManager;
+
 class AvatarData : public NodeData {
     Q_OBJECT
 
@@ -88,6 +90,7 @@ class AvatarData : public NodeData {
 
     Q_PROPERTY(QString faceModelURL READ getFaceModelURLFromScript WRITE setFaceModelURLFromScript)
     Q_PROPERTY(QString skeletonModelURL READ getSkeletonModelURLFromScript WRITE setSkeletonModelURLFromScript)
+    Q_PROPERTY(QString billboardURL READ getBillboardURL WRITE setBillboardFromURL)
 public:
     AvatarData();
     ~AvatarData();
@@ -170,6 +173,9 @@ public:
     virtual void setBillboard(const QByteArray& billboard);
     const QByteArray& getBillboard() const { return _billboard; }
     
+    void setBillboardFromURL(const QString& billboardURL);
+    const QString& getBillboardURL() { return _billboardURL; }
+    
     QString getFaceModelURLFromScript() const { return _faceModelURL.toString(); }
     void setFaceModelURLFromScript(const QString& faceModelString) { setFaceModelURL(faceModelString); }
     
@@ -177,11 +183,13 @@ public:
     void setSkeletonModelURLFromScript(const QString& skeletonModelString) { setSkeletonModelURL(QUrl(skeletonModelString)); }
     
     virtual float getBoundingRadius() const { return 1.f; }
+    
+    static void setNetworkAccessManager(QNetworkAccessManager* sharedAccessManager) { networkAccessManager = sharedAccessManager; }
 
 public slots:
     void sendIdentityPacket();
     void sendBillboardPacket();
-
+    void setBillboardFromNetworkReply();
 protected:
     glm::vec3 _position;
     glm::vec3 _handPosition;
@@ -217,6 +225,9 @@ protected:
     float _displayNameAlpha;
 
     QByteArray _billboard;
+    QString _billboardURL;
+    
+    static QNetworkAccessManager* networkAccessManager;
 
 private:
     // privatize the copy constructor and assignment operator so they cannot be called

libraries/script-engine/src/ScriptEngine.cpp

@@ -45,6 +45,7 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co
                            AbstractControllerScriptingInterface* controllerScriptingInterface) :
     _isAvatar(false),
     _avatarIdentityTimer(NULL),
+    _avatarBillboardTimer(NULL),
     _avatarData(NULL)
 {
     _scriptContents = scriptContents;
@@ -79,14 +80,17 @@ void ScriptEngine::setIsAvatar(bool isAvatar) {
     _isAvatar = isAvatar;
     
     if (_isAvatar && !_avatarIdentityTimer) {
-        // set up the avatar identity timer
+        // set up the avatar timers
         _avatarIdentityTimer = new QTimer(this);
+        _avatarBillboardTimer = new QTimer(this);
         
         // connect our slot
         connect(_avatarIdentityTimer, &QTimer::timeout, this, &ScriptEngine::sendAvatarIdentityPacket);
+        connect(_avatarBillboardTimer, &QTimer::timeout, this, &ScriptEngine::sendAvatarBillboardPacket);
         
-        // start the timer
+        // start the timers
         _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);
+        _avatarBillboardTimer->start(AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS);
     }
 }
 
@@ -196,6 +200,12 @@ void ScriptEngine::sendAvatarIdentityPacket() {
     }
 }
 
+void ScriptEngine::sendAvatarBillboardPacket() {
+    if (_isAvatar && _avatarData) {
+        _avatarData->sendBillboardPacket();
+    }
+}
+
 void ScriptEngine::run() {
     if (!_isInitialized) {
         init();

libraries/script-engine/src/ScriptEngine.h

@@ -85,10 +85,12 @@ protected:
     QScriptEngine _engine;
     bool _isAvatar;
     QTimer* _avatarIdentityTimer;
+    QTimer* _avatarBillboardTimer;
     QHash<QTimer*, QScriptValue> _timerFunctionMap;
 
 private:
     void sendAvatarIdentityPacket();
+    void sendAvatarBillboardPacket();
     
     QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
     void stopTimer(QTimer* timer);

libraries/shared/src/NodeList.cpp

@@ -549,6 +549,12 @@ void NodeList::sendDomainServerCheckIn() {
                 sendSTUNRequest();
             }
             
+            if (_numNoReplyDomainCheckIns >= MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
+                // we haven't heard back from DS in MAX_SILENT_DOMAIN_SERVER_CHECK_INS
+                // so emit our signal that indicates that
+                emit limitOfSilentDomainCheckInsReached();
+            }
+            
             // increment the count of un-replied check-ins
             _numNoReplyDomainCheckIns++;
         }  else if (AccountManager::getInstance().hasValidAccessToken()) {

libraries/shared/src/NodeList.h

@@ -132,6 +132,7 @@ signals:
     void uuidChanged(const QUuid& ownerUUID);
     void nodeAdded(SharedNodePointer);
     void nodeKilled(SharedNodePointer);
+    void limitOfSilentDomainCheckInsReached();
 private slots:
     void domainServerAuthReply(const QJsonObject& jsonObject);
 private: