Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers

2025-04-20 03:44:02 +02:00 · 2014-04-21 10:12:34 -07:00 · 2014-04-21 10:12:34 -07:00 · 25a859f95e
commit 25a859f95e
parent 59cbda20c6 b78a601514
18 changed files with 756 additions and 585 deletions
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@ -278,6 +278,7 @@ void DomainServer::createScriptedAssignmentsFromArray(const QJsonArray &configAr
                    qDebug() << "Adding scripted assignment to queue -" << *scriptAssignment;
                    qDebug() << "URL for script is" << assignmentURL;
                    
+                    // scripts passed on CL or via JSON are static - so they are added back to the queue if the node dies
                    _assignmentQueue.enqueue(SharedAssignmentPointer(scriptAssignment));
                }
            }
@ -343,7 +344,6 @@ const NodeSet STATICALLY_ASSIGNED_NODES = NodeSet() << NodeType::AudioMixer
    << NodeType::AvatarMixer << NodeType::VoxelServer << NodeType::ParticleServer
    << NodeType::MetavoxelServer;

-
 void DomainServer::addNodeToNodeListAndConfirmConnection(const QByteArray& packet, const HifiSockAddr& senderSockAddr) {

    NodeType_t nodeType;
@ -352,34 +352,40 @@ void DomainServer::addNodeToNodeListAndConfirmConnection(const QByteArray& packe
    int numPreInterestBytes = parseNodeDataFromByteArray(nodeType, publicSockAddr, localSockAddr, packet, senderSockAddr);
    
    QUuid assignmentUUID = uuidFromPacketHeader(packet);
-    SharedAssignmentPointer matchingAssignment;
+    bool isStaticAssignment = _staticAssignmentHash.contains(assignmentUUID);
+    SharedAssignmentPointer matchingAssignment = SharedAssignmentPointer();
    
-    if (!assignmentUUID.isNull() && (matchingAssignment = matchingStaticAssignmentForCheckIn(assignmentUUID, nodeType))
-        && matchingAssignment) {
-        // this is an assigned node, make sure the UUID sent is for an assignment we're actually trying to give out
+    if (isStaticAssignment) {
+        // this is a static assignment, make sure the UUID sent is for an assignment we're actually trying to give out
+         matchingAssignment = matchingQueuedAssignmentForCheckIn(assignmentUUID, nodeType);
        
-        // remove the matching assignment from the assignment queue so we don't take the next check in
-        // (if it exists)
-        removeMatchingAssignmentFromQueue(matchingAssignment);
+        if (matchingAssignment) {
+            // remove the matching assignment from the assignment queue so we don't take the next check in
+            // (if it exists)
+            removeMatchingAssignmentFromQueue(matchingAssignment);
+        }
    } else {
        assignmentUUID = QUuid();
    }
    
-    // create a new session UUID for this node
-    QUuid nodeUUID = QUuid::createUuid();
-    
-    SharedNodePointer newNode = LimitedNodeList::getInstance()->addOrUpdateNode(nodeUUID, nodeType,
-                                                                                publicSockAddr, localSockAddr);
-    
-    // when the newNode is created the linked data is also created
-    // if this was a static assignment set the UUID, set the sendingSockAddr
-    DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(newNode->getLinkedData());
-    
-    nodeData->setStaticAssignmentUUID(assignmentUUID);
-    nodeData->setSendingSockAddr(senderSockAddr);
-    
-    // reply back to the user with a PacketTypeDomainList
-    sendDomainListToNode(newNode, senderSockAddr, nodeInterestListFromPacket(packet, numPreInterestBytes));
+    // make sure this was either not a static assignment or it was and we had a matching one in teh queue
+    if ((!isStaticAssignment && !STATICALLY_ASSIGNED_NODES.contains(nodeType)) || (isStaticAssignment && matchingAssignment)) {
+        // create a new session UUID for this node
+        QUuid nodeUUID = QUuid::createUuid();
+        
+        SharedNodePointer newNode = LimitedNodeList::getInstance()->addOrUpdateNode(nodeUUID, nodeType,
+                                                                                    publicSockAddr, localSockAddr);
+        
+        // when the newNode is created the linked data is also created
+        // if this was a static assignment set the UUID, set the sendingSockAddr
+        DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(newNode->getLinkedData());
+        
+        nodeData->setStaticAssignmentUUID(assignmentUUID);
+        nodeData->setSendingSockAddr(senderSockAddr);
+        
+        // reply back to the user with a PacketTypeDomainList
+        sendDomainListToNode(newNode, senderSockAddr, nodeInterestListFromPacket(packet, numPreInterestBytes));
+    }
 }

 int DomainServer::parseNodeDataFromByteArray(NodeType_t& nodeType, HifiSockAddr& publicSockAddr,
@ -740,6 +746,16 @@ QJsonObject DomainServer::jsonObjectForNode(const SharedNodePointer& node) {
    return nodeJson;
 }

+const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment";
+
+QString pathForAssignmentScript(const QUuid& assignmentUUID) {
+    QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION);
+    newPath += "/";
+    // append the UUID for this script as the new filename, remove the curly braces
+    newPath += uuidStringWithoutCurlyBraces(assignmentUUID);
+    return newPath;
+}
+
 bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url) {
    const QString JSON_MIME_TYPE = "application/json";
    
@ -870,17 +886,13 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                assignmentPool = QString(assignmentPoolValue);
            }
            
-            const char ASSIGNMENT_SCRIPT_HOST_LOCATION[] = "resources/web/assignment";
            
            for (int i = 0; i < numInstances; i++) {
                
                // create an assignment for this saved script
                Assignment* scriptAssignment = new Assignment(Assignment::CreateCommand, Assignment::AgentType, assignmentPool);
                
-                QString newPath(ASSIGNMENT_SCRIPT_HOST_LOCATION);
-                newPath += "/";
-                // append the UUID for this script as the new filename, remove the curly braces
-                newPath += uuidStringWithoutCurlyBraces(scriptAssignment->getUUID());
+                QString newPath = pathForAssignmentScript(scriptAssignment->getUUID());
                
                // create a file with the GUID of the assignment in the script host location
                QFile scriptFile(newPath);
@ -945,6 +957,11 @@ void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer&
    qDebug() << "Reset UUID for assignment -" << *assignment.data() << "- and added to queue. Old UUID was"
        << uuidStringWithoutCurlyBraces(oldUUID);
    
+    if (assignment->getType() == Assignment::AgentType && assignment->getPayload().isEmpty()) {
+        // if this was an Agent without a script URL, we need to rename the old file so it can be retrieved at the new UUID
+        QFile::rename(pathForAssignmentScript(oldUUID), pathForAssignmentScript(assignment->getUUID()));
+    }
+    
    // add the static assignment back under the right UUID, and to the queue
    _staticAssignmentHash.insert(assignment->getUUID(), assignment);
    
@ -992,7 +1009,7 @@ void DomainServer::nodeKilled(SharedNodePointer node) {
    }
 }

-SharedAssignmentPointer DomainServer::matchingStaticAssignmentForCheckIn(const QUuid& checkInUUID, NodeType_t nodeType) {
+SharedAssignmentPointer DomainServer::matchingQueuedAssignmentForCheckIn(const QUuid& checkInUUID, NodeType_t nodeType) {
    QQueue<SharedAssignmentPointer>::iterator i = _assignmentQueue.begin();
    
    while (i != _assignmentQueue.end()) {
@ -1019,22 +1036,21 @@ SharedAssignmentPointer DomainServer::deployableAssignmentForRequest(const Assig
        bool assignmentPoolsMatch = assignment->getPool() == requestAssignment.getPool();
        
        if ((requestIsAllTypes || assignmentTypesMatch) && (nietherHasPool || assignmentPoolsMatch)) {
-
-            if (assignment->getType() == Assignment::AgentType) {
-                // if there is more than one instance to send out, simply decrease the number of instances
-                return _assignmentQueue.takeAt(sharedAssignment - _assignmentQueue.begin());
-            } else {
-                // remove the assignment from the queue
-                SharedAssignmentPointer deployableAssignment = _assignmentQueue.takeAt(sharedAssignment
-                                                                                       - _assignmentQueue.begin());
-
+            
+            // remove the assignment from the queue
+            SharedAssignmentPointer deployableAssignment = _assignmentQueue.takeAt(sharedAssignment
+                                                                                   - _assignmentQueue.begin());
+            
+            if (deployableAssignment->getType() != Assignment::AgentType
+                || _staticAssignmentHash.contains(deployableAssignment->getUUID())) {
+                // this is a static assignment
                // until we get a check-in from that GUID
                // put assignment back in queue but stick it at the back so the others have a chance to go out
                _assignmentQueue.enqueue(deployableAssignment);
-                
-                // stop looping, we've handed out an assignment
-                return deployableAssignment;
            }
+            
+            // stop looping, we've handed out an assignment
+            return deployableAssignment;
        } else {
            // push forward the iterator to check the next assignment
            ++sharedAssignment;
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@ -70,7 +70,7 @@ private:
    void createStaticAssignmentsForType(Assignment::Type type, const QJsonArray& configArray);
    void populateDefaultStaticAssignmentsExcludingTypes(const QSet<Assignment::Type>& excludedTypes);
    
-    SharedAssignmentPointer matchingStaticAssignmentForCheckIn(const QUuid& checkInUUID, NodeType_t nodeType);
+    SharedAssignmentPointer matchingQueuedAssignmentForCheckIn(const QUuid& checkInUUID, NodeType_t nodeType);
    SharedAssignmentPointer deployableAssignmentForRequest(const Assignment& requestAssignment);
    void removeMatchingAssignmentFromQueue(const SharedAssignmentPointer& removableAssignment);
    void refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer& assignment);
--- a/examples/editVoxels.js
+++ b/examples/editVoxels.js
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -356,6 +356,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) :
        QMutexLocker locker(&_settingsMutex);
        _previousScriptLocation = _settings->value("LastScriptLocation", QVariant("")).toString();
    }
+	//When -url in command line, teleport to location
+	urlGoTo(argc, constArgv);
 }

 Application::~Application() {
@ -820,6 +822,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                break;

            case Qt::Key_E:
+            case Qt::Key_PageUp:
               if (!_myAvatar->getDriveKeys(UP)) {
                    _myAvatar->jump();
                }
@ -831,6 +834,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                break;

            case Qt::Key_C:
+            case Qt::Key_PageDown:
                _myAvatar->setDriveKeys(DOWN, 1.f);
                break;

@ -1017,10 +1021,12 @@ void Application::keyReleaseEvent(QKeyEvent* event) {

    switch (event->key()) {
        case Qt::Key_E:
+        case Qt::Key_PageUp:
            _myAvatar->setDriveKeys(UP, 0.f);
            break;

        case Qt::Key_C:
+        case Qt::Key_PageDown:
            _myAvatar->setDriveKeys(DOWN, 0.f);
            break;

@ -2732,7 +2738,7 @@ void Application::displayOverlay() {
            (Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
            Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth))
                ? 80 : 20;
-        drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 1.0f, 0.f, frameTimer, WHITE_TEXT);
+        drawText(_glWidget->width() - 100, _glWidget->height() - timerBottom, 0.30f, 0.0f, 0, frameTimer, WHITE_TEXT);
    }

    _overlays.render2D();
@ -3566,3 +3572,38 @@ void Application::takeSnapshot() {

    Snapshot::saveSnapshot(_glWidget, _myAvatar);
 }
+
+void Application::urlGoTo(int argc, const char * constArgv[]) {
+    //Gets the url (hifi://domain/destination/orientation)
+    QString customUrl = getCmdOption(argc, constArgv, "-url");
+
+    if (customUrl.startsWith("hifi://")) {
+        QStringList urlParts = customUrl.remove(0, CUSTOM_URL_SCHEME.length() + 2).split('/', QString::SkipEmptyParts);
+        if (urlParts.count() > 1) {
+            // if url has 2 or more parts, the first one is domain name
+            QString domain = urlParts[0];
+
+            // second part is either a destination coordinate or
+            // a place name
+            QString destination = urlParts[1];
+
+            // any third part is an avatar orientation.
+            QString orientation = urlParts.count() > 2 ? urlParts[2] : QString();
+
+            Menu::goToDomain(domain);
+                
+            // goto either @user, #place, or x-xx,y-yy,z-zz
+            // style co-ordinate.
+            Menu::goTo(destination);
+
+            if (!orientation.isEmpty()) {
+                // location orientation
+                Menu::goToOrientation(orientation);
+            }
+        } else if (urlParts.count() == 1) {
+            // location coordinates or place name
+            QString destination = urlParts[0];
+            Menu::goTo(destination);
+        }
+    }
+}
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@ -129,6 +129,7 @@ public:
    void initializeGL();
    void paintGL();
    void resizeGL(int width, int height);
+    void urlGoTo(int argc, const char * constArgv[]);

    void keyPressEvent(QKeyEvent* event);
    void keyReleaseEvent(QKeyEvent* event);
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@ -1068,7 +1068,6 @@ bool Audio::switchOutputToAudioDevice(const QAudioDeviceInfo& outputDeviceInfo)
        
        delete _audioOutput;
        _audioOutput = NULL;
-        _numInputCallbackBytes = 0;

        _loopbackOutputDevice = NULL;
        delete _loopbackAudioOutput;
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -315,7 +315,8 @@ Menu::Menu() :
    addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Visage, 0, true,
        appInstance->getVisage(), SLOT(updateEnabled()));
 #endif
-
+    
+    addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::GlowWhenSpeaking, 0, true);
    addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, false);

    QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options");
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -135,10 +135,10 @@ public:
    
    void removeAction(QMenu* menu, const QString& actionName);

-    bool goToDestination(QString destination);
-    void goToOrientation(QString orientation);
-    void goToDomain(const QString newDomain);
-    void goTo(QString destination);
+    bool static goToDestination(QString destination);
+    void static goToOrientation(QString orientation);
+    void static goToDomain(const QString newDomain);
+    void static goTo(QString destination);

 public slots:

@ -304,6 +304,7 @@ namespace MenuOption {
    const QString Fullscreen = "Fullscreen";
    const QString FullscreenMirror = "Fullscreen Mirror";
    const QString GlowMode = "Cycle Glow Mode";
+    const QString GlowWhenSpeaking = "Glow When Speaking";
    const QString GoHome = "Go Home";
    const QString GoTo = "Go To...";
    const QString GoToDomain = "Go To Domain...";
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@ -34,6 +34,7 @@ static const QString TEXDIR_FIELD = "texdir";
 static const QString LOD_FIELD = "lod";

 static const QString S3_URL = "http://highfidelity-public.s3-us-west-1.amazonaws.com";
+static const QString DATA_SERVER_URL = "https://data-web.highfidelity.io";
 static const QString MODEL_URL = "/api/v1/models";

 static const QString SETTING_NAME = "LastModelUploadLocation";
@ -201,14 +202,14 @@ void ModelUploader::send() {
    
    JSONCallbackParameters callbackParams;
    callbackParams.jsonCallbackReceiver = this;
-    callbackParams.jsonCallbackMethod = "uploadSuccess";
+    callbackParams.jsonCallbackMethod = "checkJSON";
    callbackParams.errorCallbackReceiver = this;
    callbackParams.errorCallbackMethod = "uploadFailed";
-    callbackParams.updateReciever = this;
-    callbackParams.updateSlot = SLOT(uploadUpdate(qint64, qint64));
    
-    AccountManager::getInstance().authenticatedRequest(MODEL_URL, QNetworkAccessManager::PostOperation, callbackParams, QByteArray(), _dataMultiPart);
-    _dataMultiPart = NULL;
+    AccountManager::getInstance().authenticatedRequest(MODEL_URL + "/" + QFileInfo(_url).baseName(),
+                                                       QNetworkAccessManager::GetOperation,
+                                                       callbackParams);
+    
    qDebug() << "Sending model...";
    _progressDialog = new QDialog();
    _progressBar = new QProgressBar(_progressDialog);
@ -226,6 +227,61 @@ void ModelUploader::send() {
    _progressBar = NULL;
 }

+void ModelUploader::checkJSON(const QJsonObject& jsonResponse) {
+    if (jsonResponse.contains("status") && jsonResponse.value("status").toString() == "success") {
+        qDebug() << "status : success";
+        JSONCallbackParameters callbackParams;
+        callbackParams.jsonCallbackReceiver = this;
+        callbackParams.jsonCallbackMethod = "uploadSuccess";
+        callbackParams.errorCallbackReceiver = this;
+        callbackParams.errorCallbackMethod = "uploadFailed";
+        callbackParams.updateReciever = this;
+        callbackParams.updateSlot = SLOT(uploadUpdate(qint64, qint64));
+        
+        if (jsonResponse.contains("exists") && jsonResponse.value("exists").toBool()) {
+            qDebug() << "exists : true";
+            if (jsonResponse.contains("can_update") && jsonResponse.value("can_update").toBool()) {
+                qDebug() << "can_update : true";
+                
+                AccountManager::getInstance().authenticatedRequest(MODEL_URL + "/" + QFileInfo(_url).baseName(),
+                                                                   QNetworkAccessManager::PutOperation,
+                                                                   callbackParams,
+                                                                   QByteArray(),
+                                                                   _dataMultiPart);
+                _dataMultiPart = NULL;
+            } else {
+                qDebug() << "can_update : false";
+                if (_progressDialog) {
+                    _progressDialog->reject();
+                }
+                QMessageBox::warning(NULL,
+                                     QString("ModelUploader::checkJSON()"),
+                                     QString("This model already exist and is own by someone else."),
+                                     QMessageBox::Ok);
+                deleteLater();
+            }
+        } else {
+            qDebug() << "exists : false";
+            AccountManager::getInstance().authenticatedRequest(MODEL_URL,
+                                                               QNetworkAccessManager::PostOperation,
+                                                               callbackParams,
+                                                               QByteArray(),
+                                                               _dataMultiPart);
+            _dataMultiPart = NULL;
+        }
+    } else {
+        qDebug() << "status : failed";
+        if (_progressDialog) {
+            _progressDialog->reject();
+        }
+        QMessageBox::warning(NULL,
+                             QString("ModelUploader::checkJSON()"),
+                             QString("Something went wrong with the data-server."),
+                             QMessageBox::Ok);
+        deleteLater();
+    }
+}
+
 void ModelUploader::uploadUpdate(qint64 bytesSent, qint64 bytesTotal) {
    if (_progressDialog) {
        _progressBar->setRange(0, bytesTotal);
@ -249,11 +305,11 @@ void ModelUploader::uploadFailed(QNetworkReply::NetworkError errorCode, const QS
    if (_progressDialog) {
        _progressDialog->reject();
    }
+    qDebug() << "Model upload failed (" << errorCode << "): " << errorString;
    QMessageBox::warning(NULL,
                         QString("ModelUploader::uploadFailed()"),
                         QString("There was a problem with your upload, please try again later."),
                         QMessageBox::Ok);
-    qDebug() << "Model upload failed (" << errorCode << "): " << errorString;
    deleteLater();
 }

--- a/interface/src/ModelUploader.h
+++ b/interface/src/ModelUploader.h
@ -30,6 +30,7 @@ public slots:
    void send();
    
 private slots:
+    void checkJSON(const QJsonObject& jsonResponse);
    void uploadUpdate(qint64 bytesSent, qint64 bytesTotal);
    void uploadSuccess(const QJsonObject& jsonResponse);
    void uploadFailed(QNetworkReply::NetworkError errorCode, const QString& errorString);
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@ -211,9 +211,14 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode) {
        const float GLOW_DISTANCE = 20.0f;
        const float GLOW_MAX_LOUDNESS = 2500.0f;
        const float MAX_GLOW = 0.5f;
-        const float GLOW_FROM_AVERAGE_LOUDNESS = ((this == Application::getInstance()->getAvatar())
-                                                  ? 0.0f
-                                                  : MAX_GLOW * getHeadData()->getAudioLoudness() / GLOW_MAX_LOUDNESS);
+        
+        float GLOW_FROM_AVERAGE_LOUDNESS = ((this == Application::getInstance()->getAvatar())
+                                            ? 0.0f
+                                            : MAX_GLOW * getHeadData()->getAudioLoudness() / GLOW_MAX_LOUDNESS);
+        if (!Menu::getInstance()->isOptionChecked(MenuOption::GlowWhenSpeaking)) {
+            GLOW_FROM_AVERAGE_LOUDNESS = 0.0f;
+        }
+            
        Glower glower(_moving && distanceToTarget > GLOW_DISTANCE && renderMode == NORMAL_RENDER_MODE
                      ? 1.0f
                      : GLOW_FROM_AVERAGE_LOUDNESS);
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@ -468,8 +468,13 @@ void Model::clearShapes() {

 void Model::rebuildShapes() {
    clearShapes();
+    
+    if (!_geometry) {
+        return;
+    }
+    
    const FBXGeometry& geometry = _geometry->getFBXGeometry();
-
+    
    if (geometry.joints.isEmpty()) {
        return;
    }
--- a/interface/src/scripting/ClipboardScriptingInterface.cpp
+++ b/interface/src/scripting/ClipboardScriptingInterface.cpp
@ -78,7 +78,7 @@ void ClipboardScriptingInterface::exportVoxel(float x, float y, float z, float s
 }

 bool ClipboardScriptingInterface::importVoxels() {
-    qDebug() << "[DEBUG] Importing ... ";
+    qDebug() << "Importing ... ";
    QEventLoop loop;
    connect(Application::getInstance(), SIGNAL(importDone()), &loop, SLOT(quit()));
    emit readyToImport();
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@ -171,6 +171,9 @@ void Stats::display(

    unsigned int backgroundColor = 0x33333399;
    int verticalOffset = 0, lines = 0;
+    float scale = 0.10f;
+    float rotation = 0.0f;
+    int font = 2;

    QLocale locale(QLocale::English);
    std::stringstream voxelStats;
@ -198,11 +201,11 @@ void Stats::display(
    sprintf(framesPerSecond, "Framerate: %3.0f FPS", fps);
 
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, serverNodes, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, serverNodes, color);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarNodes, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarNodes, color);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, framesPerSecond, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, framesPerSecond, color);

    if (_expanded) {
        char packetsPerSecondString[30];
@ -211,9 +214,9 @@ void Stats::display(
        sprintf(averageMegabitsPerSecond, "Mbps: %3.2f", (float)bytesPerSecond * 8.f / 1000000.f);

        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, packetsPerSecondString, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, packetsPerSecondString, color);
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, averageMegabitsPerSecond, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, averageMegabitsPerSecond, color);
    }

    verticalOffset = 0;
@ -258,7 +261,7 @@ void Stats::display(
                "Buffer msecs %.1f",
                (float) (audio->getNetworkBufferLengthSamplesPerChannel() + (float) audio->getJitterBufferSamples()) /
                (float) audio->getNetworkSampleRate() * 1000.f);
-        drawText(30, glWidget->height() - 22, 0.10f, 0.f, 2.f, audioJitter, color);
+        drawText(30, glWidget->height() - 22, scale, rotation, font, audioJitter, color);
        
                 
        char audioPing[30];
@ -271,18 +274,18 @@ void Stats::display(
        sprintf(voxelAvgPing, "Voxel avg ping: %d", pingVoxel);

        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, audioPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, audioPing, color);
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPing, color);
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, voxelAvgPing, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelAvgPing, color);

        if (_expanded) {
            char voxelMaxPing[30];
            sprintf(voxelMaxPing, "Voxel max ping: %d", pingVoxelMax);

            verticalOffset += STATS_PELS_PER_LINE;
-            drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, voxelMaxPing, color);
+            drawText(horizontalOffset, verticalOffset, scale, rotation, font, voxelMaxPing, color);
        }

        verticalOffset = 0;
@ -306,11 +309,11 @@ void Stats::display(
    char avatarMixerStats[200];

    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarPosition, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarPosition, color);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarVelocity, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarVelocity, color);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarBodyYaw, color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarBodyYaw, color);

    if (_expanded) {
        SharedNodePointer avatarMixer = NodeList::getInstance()->soloNodeOfType(NodeType::AvatarMixer);
@ -323,7 +326,7 @@ void Stats::display(
        }

        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, avatarMixerStats, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, avatarMixerStats, color);
        
        stringstream downloads;
        downloads << "Downloads: ";
@ -333,7 +336,7 @@ void Stats::display(
        downloads << "(" << ResourceCache::getPendingRequestCount() << " pending)";
        
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, downloads.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, downloads.str().c_str(), color);
    }

    verticalOffset = 0;
@ -354,7 +357,7 @@ void Stats::display(
        voxelStats.str("");
        voxelStats << "Voxels Memory Nodes: " << VoxelTreeElement::getTotalMemoryUsage() / 1000000.f << "MB";
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);

        voxelStats.str("");
        voxelStats << 
@ -364,14 +367,14 @@ void Stats::display(
            voxelStats << " / GPU: " << voxels->getVoxelMemoryUsageGPU() / 1000000.f << "MB";
        }
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);

        // Voxel Rendering
        voxelStats.str("");
        voxelStats.precision(4);
        voxelStats << "Voxel Rendering Slots Max: " << voxels->getMaxVoxels() / 1000.f << "K";
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);
    }

    voxelStats.str("");
@ -379,7 +382,7 @@ void Stats::display(
    voxelStats << "Drawn: " << voxels->getVoxelsWritten() / 1000.f << "K " <<
        "Abandoned: " << voxels->getAbandonedVoxels() / 1000.f << "K ";
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);

    // iterate all the current voxel stats, and list their sending modes, and total voxel counts
    std::stringstream sendingMode("");
@ -424,7 +427,7 @@ void Stats::display(
            sendingMode << " <SCENE STABLE>";
        }
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)sendingMode.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)sendingMode.str().c_str(), color);
    }

    // Incoming packets
@ -435,7 +438,7 @@ void Stats::display(
        voxelStats << "Voxel Packets to Process: " << qPrintable(packetsString)
                    << " [Recent Max: " << qPrintable(maxString) << "]";        
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);
    }

    if (_resetRecentMaxPacketsSoon && voxelPacketsToProcess > 0) {
@ -458,7 +461,7 @@ void Stats::display(
    voxelStats.str("");
    voxelStats << "Server voxels: " << qPrintable(serversTotalString);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);

    if (_expanded) {
        QString serversInternalString = locale.toString((uint)totalInternal);
@ -469,7 +472,7 @@ void Stats::display(
            "Internal: " << qPrintable(serversInternalString) << "  " <<
            "Leaves: " << qPrintable(serversLeavesString) << "";
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);
    }

    unsigned long localTotal = VoxelTreeElement::getNodeCount();
@ -479,7 +482,7 @@ void Stats::display(
    voxelStats.str("");
    voxelStats << "Local voxels: " << qPrintable(localTotalString);
    verticalOffset += STATS_PELS_PER_LINE;
-    drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+    drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);

    if (_expanded) {
        unsigned long localInternal = VoxelTreeElement::getInternalNodeCount();
@ -492,7 +495,7 @@ void Stats::display(
            "Internal: " << qPrintable(localInternalString) << "  " <<
            "Leaves: " << qPrintable(localLeavesString) << "";
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0, 2, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);
    }

    // LOD Details
@ -501,7 +504,7 @@ void Stats::display(
        QString displayLODDetails = Menu::getInstance()->getLODFeedbackText();
        voxelStats << "LOD: You can see " << qPrintable(displayLODDetails.trimmed());
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, (char*)voxelStats.str().c_str(), color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, (char*)voxelStats.str().c_str(), color);
    }


@ -526,7 +529,7 @@ void Stats::display(
                );
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        float preDelay = Menu::getInstance()->isOptionChecked(MenuOption::AudioSpatialProcessingPreDelay) ? 
                                        audioReflector->getPreDelay() : 0.0f;
@ -539,14 +542,15 @@ void Stats::display(
                audioReflector->getSoundMsPerMeter());
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);
        
        bool distanceAttenuationDisabled = Menu::getInstance()->isOptionChecked(
                                                        MenuOption::AudioSpatialProcessingDontDistanceAttenuate);

        bool alternateDistanceAttenuationEnabled = Menu::getInstance()->isOptionChecked(
                                                        MenuOption::AudioSpatialProcessingAlternateDistanceAttenuate);
-
+        
        sprintf(reflectionsStatus, "Attenuation: average %5.3f, max %5.3f, min %5.3f, %s: %5.3f", 
                audioReflector->getAverageAttenuation(),
                audioReflector->getMaxAttenuation(),
@ -556,7 +560,7 @@ void Stats::display(
                audioReflector->getDistanceAttenuationScalingFactor());
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        sprintf(reflectionsStatus, "Local Audio: %s Attenuation: %5.3f", 
                (Menu::getInstance()->isOptionChecked(MenuOption::AudioSpatialProcessingProcessLocalAudio)
@ -564,7 +568,7 @@ void Stats::display(
                audioReflector->getLocalAudioAttenuationFactor());
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        bool diffusionEnabled = Menu::getInstance()->isOptionChecked(MenuOption::AudioSpatialProcessingWithDiffusions);
        int fanout = diffusionEnabled ? audioReflector->getDiffusionFanout() : 0;
@ -573,7 +577,7 @@ void Stats::display(
                    (diffusionEnabled ? "yes" : "no"), fanout, diffusionPaths);
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        const float AS_PERCENT = 100.0f;
        float reflectiveRatio = audioReflector->getReflectiveRatio() * AS_PERCENT;
@ -583,7 +587,7 @@ void Stats::display(
                    reflectiveRatio, diffusionRatio, absorptionRatio);
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        sprintf(reflectionsStatus, "Comb Filter Window: %5.3f ms, Allowed: %d, Suppressed: %d", 
                    audioReflector->getCombFilterWindow(), 
@ -591,7 +595,7 @@ void Stats::display(
                    audioReflector->getEchoesSuppressed());
                
        verticalOffset += STATS_PELS_PER_LINE;
-        drawText(horizontalOffset, verticalOffset, 0.10f, 0.f, 2.f, reflectionsStatus, color);
+        drawText(horizontalOffset, verticalOffset, scale, rotation, font, reflectionsStatus, color);

        sprintf(reflectionsStatus, "Wet/Dry Mix: Original: %5.3f Echoes: %5.3f", 
                    audioReflector->getOriginalSourceAttenuation(), 
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@ -40,6 +40,7 @@ void Cube3DOverlay::render() {
    if (_isSolid) {
        glutSolidCube(_size);
    } else {
+        glLineWidth(_lineWidth);
        glutWireCube(_size);
    }
    glPopMatrix();
--- a/libraries/audio/src/Sound.cpp
+++ b/libraries/audio/src/Sound.cpp
@ -67,7 +67,8 @@ Sound::Sound(float volume, float frequency, float duration, float decay, QObject
 }

 Sound::Sound(const QUrl& sampleURL, QObject* parent) :
-    QObject(parent)
+    QObject(parent),
+    _hasDownloaded(false)
 {
    // assume we have a QApplication or QCoreApplication instance and use the
    // QNetworkAccess manager to grab the raw audio file at the given URL
@ -111,6 +112,8 @@ void Sound::replyFinished() {
    } else {
        qDebug() << "Network reply without 'Content-Type'.";
    }
+    
+    _hasDownloaded = true;
 }

 void Sound::replyError(QNetworkReply::NetworkError code) {
--- a/libraries/audio/src/Sound.h
+++ b/libraries/audio/src/Sound.h
@ -18,18 +18,19 @@
 class Sound : public QObject {
    Q_OBJECT
    
-    Q_PROPERTY(bool empty READ isEmpty)
+    Q_PROPERTY(bool downloaded READ hasDownloaded)
 public:
    Sound(const QUrl& sampleURL, QObject* parent = NULL);
    Sound(float volume, float frequency, float duration, float decay, QObject* parent = NULL);
    
-    bool isEmpty() const { return _byteArray.isEmpty(); }
+    bool hasDownloaded() const { return _hasDownloaded; }
    
    const QByteArray& getByteArray() { return _byteArray; }

 private:
    QByteArray _byteArray;
-
+    bool _hasDownloaded;
+    
    void downSample(const QByteArray& rawAudioByteArray);
    void interpretAsWav(const QByteArray& inputAudioByteArray, QByteArray& outputAudioByteArray);

--- a/libraries/voxels/src/VoxelsScriptingInterface.h
+++ b/libraries/voxels/src/VoxelsScriptingInterface.h
@ -36,6 +36,9 @@ public:
    void setUndoStack(QUndoStack* undoStack) { _undoStack = undoStack; }

 public slots:
+    
+    /// provide the world scale
+    const int getTreeScale() const { return TREE_SCALE; }

    /// checks the local voxel tree for a voxel at the specified location and scale
    /// \param x the x-coordinate of the voxel (in meter units)