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

Conflicts:
	domain-server/resources/web/js/settings.js
	domain-server/src/DomainServerSettingsManager.cpp

assignment-client/src/Agent.cpp

@@ -206,7 +206,7 @@ void Agent::run() {
         scriptURL = QUrl(_payload);
     }
    
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkReply *reply = networkAccessManager.get(QNetworkRequest(scriptURL));
     
     QNetworkDiskCache* cache = new QNetworkDiskCache();

assignment-client/src/AssignmentClient.cpp

@@ -59,6 +59,7 @@ AssignmentClient::AssignmentClient(int &argc, char **argv) :
     const QString ASSIGNMENT_POOL_OPTION = "pool";
     const QString ASSIGNMENT_WALLET_DESTINATION_ID_OPTION = "wallet";
     const QString CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION = "a";
+    const QString CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION = "p";
 
     Assignment::Type requestAssignmentType = Assignment::AllTypes;
 
@@ -87,17 +88,29 @@ AssignmentClient::AssignmentClient(int &argc, char **argv) :
 
     // create a NodeList as an unassigned client
     NodeList* nodeList = NodeList::createInstance(NodeType::Unassigned);
+    
+    unsigned short assignmentServerPort = DEFAULT_DOMAIN_SERVER_PORT;
+    
+    // check for an overriden assignment server port
+    if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION)) {
+        assignmentServerPort =
+            argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION).toString().toUInt();
+    }
+    
+    HifiSockAddr assignmentServerSocket(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME, assignmentServerPort);
 
     // check for an overriden assignment server hostname
     if (argumentVariantMap.contains(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION)) {
         _assignmentServerHostname = argumentVariantMap.value(CUSTOM_ASSIGNMENT_SERVER_HOSTNAME_OPTION).toString();
 
-        // set the custom assignment socket on our NodeList
+        // change the hostname for our assignment server
-        HifiSockAddr customAssignmentSocket = HifiSockAddr(_assignmentServerHostname, DEFAULT_DOMAIN_SERVER_PORT);
+        assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerSocket.getPort());
-
-        nodeList->setAssignmentServerSocket(customAssignmentSocket);
     }
+    
+    nodeList->setAssignmentServerSocket(assignmentServerSocket);
 
+    qDebug() << "Assignment server socket is" << assignmentServerSocket;
+    
     // call a timer function every ASSIGNMENT_REQUEST_INTERVAL_MSECS to ask for assignment, if required
     qDebug() << "Waiting for assignment -" << _requestAssignment;
 

assignment-client/src/octree/OctreeServer.cpp

@@ -940,7 +940,7 @@ void OctreeServer::run() {
         qDebug("--statusHost=%s", statusHost);
         _statusHost = statusHost;
     } else {
-        _statusHost = QHostAddress(getHostOrderLocalAddress()).toString();
+        _statusHost = getLocalAddress().toString();
     }
     qDebug("statusHost=%s", qPrintable(_statusHost));
 

domain-server/resources/describe-settings.json

@@ -33,6 +33,14 @@
             "label": "None: use the network information I have entered for this domain at data.highfidelity.io"
           }
         ]
+      },
+      {
+        "name": "local_port",
+        "label": "Local UDP Port",
+        "help": "This is the local port your domain-server binds to for UDP connections.<br/>Depending on your router, this may need to be changed to run multiple full automatic networking domain-servers in the same network.",
+        "default": "40102",
+        "type": "int",
+        "advanced": true
       }
     ]
   },

domain-server/resources/web/js/settings.js

@@ -48,9 +48,14 @@ var viewHelpers = {
         
         form_group += "<input type='hidden' name='" + setting_name + "' value='" + setting_value + "'>"
       } else {
-        form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name +
+        
-        "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
+        if (input_type == 'integer') {
-        "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
+          input_type = "text"
+        }
+        
+        form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name + 
+          "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
+          "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
       }
       
       form_group += "<span class='help-block'>" + setting.help + "</span>" 

domain-server/src/DomainServer.cpp

@@ -57,6 +57,10 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     setApplicationName("domain-server");
     QSettings::setDefaultFormat(QSettings::IniFormat);
     
+    // make sure we have a fresh AccountManager instance
+    // (need this since domain-server can restart itself and maintain static variables)
+    AccountManager::getInstance(true);
+    
     _settingsManager.setupConfigMap(arguments());
     
     installNativeEventFilter(&_shutdownEventListener);
@@ -82,10 +86,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 void DomainServer::restart() {
     qDebug() << "domain-server is restarting.";
     
-    // make sure all static instances are reset
-    LimitedNodeList::getInstance()->reset();
-    AccountManager::getInstance(true);
-    
     exit(DomainServer::EXIT_CODE_REBOOT);
 }
 
@@ -189,17 +189,20 @@ bool DomainServer::optionallySetupOAuth() {
 
 const QString DOMAIN_CONFIG_ID_KEY = "id";
 
+const QString METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH = "metaverse.automatic_networking";
+const QString FULL_AUTOMATIC_NETWORKING_VALUE = "full";
+const QString IP_ONLY_AUTOMATIC_NETWORKING_VALUE = "ip";
+const QString DISABLED_AUTOMATIC_NETWORKING_VALUE = "disabled";
+
 void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
 
-    const QString CUSTOM_PORT_OPTION = "port";
+    const QString CUSTOM_LOCAL_PORT_OPTION = "metaverse.local_port";
-    unsigned short domainServerPort = DEFAULT_DOMAIN_SERVER_PORT;
+
+    QVariant localPortValue = _settingsManager.valueOrDefaultValueForKeyPath(CUSTOM_LOCAL_PORT_OPTION);
+    unsigned short domainServerPort = (unsigned short) localPortValue.toUInt();
     
     QVariantMap& settingsMap = _settingsManager.getSettingsMap();
 
-    if (settingsMap.contains(CUSTOM_PORT_OPTION)) {
-        domainServerPort = (unsigned short) settingsMap.value(CUSTOM_PORT_OPTION).toUInt();
-    }
-
     unsigned short domainServerDTLSPort = 0;
 
     if (_isUsingDTLS) {
@@ -310,12 +313,7 @@ bool DomainServer::optionallySetupAssignmentPayment() {
     return true;
 }
 
-const QString FULL_AUTOMATIC_NETWORKING_VALUE = "full";
-const QString IP_ONLY_AUTOMATIC_NETWORKING_VALUE = "ip";
-const QString DISABLED_AUTOMATIC_NETWORKING_VALUE = "disabled";
-
 void DomainServer::setupAutomaticNetworking() {
-    const QString METAVERSE_AUTOMATIC_NETWORKING_KEY_PATH = "metaverse.automatic_networking";
     
     if (!didSetupAccountManagerWithAccessToken()) {
         qDebug() << "Cannot setup domain-server automatic networking without an access token.";
@@ -357,7 +355,8 @@ void DomainServer::setupAutomaticNetworking() {
                 connect(iceHeartbeatTimer, &QTimer::timeout, this, &DomainServer::performICEUpdates);
                 iceHeartbeatTimer->start(ICE_HEARBEAT_INTERVAL_MSECS);
                 
-                // call our sendHeartbeaToIceServer immediately anytime a public address changes
+                // call our sendHeartbeaToIceServer immediately anytime a local or public socket changes
+                connect(nodeList, &LimitedNodeList::localSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
                 connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
                 
                 // tell the data server which type of automatic networking we are using

domain-server/src/DomainServerSettingsManager.cpp

@@ -262,9 +262,12 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
             // make sure the resulting json value has the right type
             const QString settingType = settingDescription.toObject()[SETTING_DESCRIPTION_TYPE_KEY].toString();
             const QString INPUT_DOUBLE_TYPE = "double";
+            const QString INPUT_INTEGER_TYPE = "int";
             
             if (settingType == INPUT_DOUBLE_TYPE) {
                 settingMap[key] = newValue.toString().toDouble();
+            } else if (settingType == INPUT_INTEGER_TYPE) {
+                settingMap[key] = newValue.toString().toInt();
             } else {
                 settingMap[key] = newValue.toString();
             }

examples/leapHands.js

@@ -30,8 +30,6 @@ var leapHands = (function () {
         CALIBRATING = 1,
         CALIBRATED = 2,
         CALIBRATION_TIME = 1000,  // milliseconds
-        PI = 3.141593,
-        isWindows,
         avatarScale,
         avatarFaceModelURL,
         avatarSkeletonModelURL,
@@ -132,9 +130,6 @@ var leapHands = (function () {
 
         if (hands[0].controller.isActive() && hands[1].controller.isActive()) {
             leapHandHeight = (hands[0].controller.getAbsTranslation().y + hands[1].controller.getAbsTranslation().y) / 2.0;
-
-            // TODO: Temporary detection of Windows to work around Leap Controller problem.
-            isWindows = (hands[1].controller.getAbsRotation().z > (0.25 * PI));
         } else {
             calibrationStatus = UNCALIBRATED;
             return;
@@ -318,11 +313,7 @@ var leapHands = (function () {
             j,
             side,
             handOffset,
-            handRoll,
-            handPitch,
-            handYaw,
             handRotation,
-            wristAbsRotation,
             locRotation,
             cameraOrientation,
             inverseAvatarOrientation;
@@ -361,20 +352,22 @@ var leapHands = (function () {
                     handOffset.x = -handOffset.x;
 
                     // Hand rotation in camera coordinates ...
-                    // TODO: 2.0* scale factors should not be necessary; Leap Motion controller code needs investigating.
+                    handRotation = wrists[h].controller.getAbsRotation();
-                    handRoll = 2.0 * -hands[h].controller.getAbsRotation().z;
+                    handRotation = {
-                    wristAbsRotation = wrists[h].controller.getAbsRotation();
+                        x: handRotation.z,
-                    handPitch = 2.0 * wristAbsRotation.x - PI / 2.0;
+                        y: handRotation.y,
-                    handYaw = 2.0 * -wristAbsRotation.y;
+                        z: handRotation.x,
-                    // TODO: Roll values only work if hand is upside down; Leap Motion controller code needs investigating.
+                        w: handRotation.w
-                    handRoll = PI + handRoll;
+                    };
 
                     if (h === 0) {
-                        handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 1, z: 0 }),
+                        handRotation.x = -handRotation.x;
-                            Quat.fromVec3Radians({ x: handRoll, y: handYaw, z: -handPitch }));
+                        handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 1, y: 0, z: 0 }), handRotation);
+                        handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 0, z: 1 }), handRotation);
                     } else {
-                        handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 1, z: 0 }),
+                        handRotation.z = -handRotation.z;
-                            Quat.fromVec3Radians({ x: -handRoll, y: handYaw, z: handPitch }));
+                        handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 1, y: 0, z: 0 }), handRotation);
+                        handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 0, z: 1 }), handRotation);
                     }
 
                     // Hand rotation in avatar coordinates ...
@@ -392,25 +385,22 @@ var leapHands = (function () {
                         z: hands[h].zeroPosition.z - handOffset.z
                     };
 
-                    // TODO: 2.0* scale factors should not be necessary; Leap Motion controller code needs investigating.
+                    handRotation = wrists[h].controller.getAbsRotation();
-                    handRoll = 2.0 * -hands[h].controller.getAbsRotation().z;
+                    handRotation = {
-                    wristAbsRotation = wrists[h].controller.getAbsRotation();
+                        x: handRotation.z,
-                    handPitch = 2.0 * -wristAbsRotation.x;
+                        y: handRotation.y,
-                    handYaw = 2.0 * wristAbsRotation.y;
+                        z: handRotation.x,
+                        w: handRotation.w
+                    };
 
-                    // TODO: Leap Motion controller's right-hand roll calculation only works if physical hand is upside down.
-                    // Approximate fix is to add a fudge factor.
-                    if (h === 1 && isWindows) {
-                        handRoll = handRoll + 0.6 * PI;
-                    }
-
-                    // Hand position and orientation ...
                     if (h === 0) {
+                        handRotation.x = -handRotation.x;
                         handRotation = Quat.multiply(Quat.angleAxis(-90.0, { x: 0, y: 1, z: 0 }),
-                            Quat.fromVec3Radians({ x: handRoll, y: handYaw, z: -handPitch }));
+                            handRotation);
                     } else {
+                        handRotation.z = -handRotation.z;
                         handRotation = Quat.multiply(Quat.angleAxis(90.0, { x: 0, y: 1, z: 0 }),
-                            Quat.fromVec3Radians({ x: -handRoll, y: handYaw, z: handPitch }));
+                            handRotation);
                     }
                 }
 

examples/libraries/entitySelectionTool.js

@@ -169,7 +169,14 @@ SelectionDisplay = (function () {
                     alpha: 0.2,
                     solid: true,
                     visible: false,
-                    rotation: yawOverlayRotation
+                    rotation: yawOverlayRotation,
+                    hasTickMarks: true,
+                    majorTickMarksAngle: 12.5,
+                    minorTickMarksAngle: 0,
+                    majorTickMarksLength: -0.25,
+                    minorTickMarksLength: 0,
+                    majorTickMarksColor: { red: 0, green: 0, blue: 0 },
+                    minorTickMarksColor: { red: 0, green: 0, blue: 0 },
                 });
 
     var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
@@ -179,7 +186,15 @@ SelectionDisplay = (function () {
                     alpha: 0.2,
                     solid: true,
                     visible: false,
-                    rotation: yawOverlayRotation
+                    rotation: yawOverlayRotation,
+
+                    hasTickMarks: true,
+                    majorTickMarksAngle: 45.0,
+                    minorTickMarksAngle: 5,
+                    majorTickMarksLength: 0.25,
+                    minorTickMarksLength: 0.1,
+                    majorTickMarksColor: { red: 0, green: 0, blue: 0 },
+                    minorTickMarksColor: { red: 0, green: 0, blue: 0 },
                 });
 
     var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
@@ -571,7 +586,7 @@ SelectionDisplay = (function () {
                                 innerRadius: 0.9,
                                 startAt: 0,
                                 endAt: 360,
-                                alpha: outerAlpha
+                                alpha: outerAlpha,
                             });
 
         Overlays.editOverlay(rotateOverlayCurrent, 
@@ -584,7 +599,7 @@ SelectionDisplay = (function () {
                                 size: outerRadius,
                                 startAt: 0,
                                 endAt: 0,
-                                innerRadius: 0.9
+                                innerRadius: 0.9,
                             });
 
         // TODO: we have not implemented the rotating handle/controls yet... so for now, these handles are hidden

interface/src/Application.cpp

@@ -350,7 +350,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     QString cachePath = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
 
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkDiskCache* cache = new QNetworkDiskCache();
     cache->setCacheDirectory(!cachePath.isEmpty() ? cachePath : "interfaceCache");
     networkAccessManager.setCache(cache);

interface/src/FileLogger.cpp

@@ -28,7 +28,7 @@ FileLogger::FileLogger(QObject* parent) :
     setExtraDebugging(false);
 
     _fileName = FileUtils::standardPath(LOGS_DIRECTORY);
-    QHostAddress clientAddress = QHostAddress(getHostOrderLocalAddress());
+    QHostAddress clientAddress = getLocalAddress();
     QDateTime now = QDateTime::currentDateTime();
     _fileName.append(QString(FILENAME_FORMAT).arg(clientAddress.toString(), now.toString(DATETIME_FORMAT)));
 }

interface/src/ScriptsModel.cpp

@@ -117,7 +117,7 @@ void ScriptsModel::requestRemoteFiles(QString marker) {
     }
     url.setQuery(query);
 
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkRequest request(url);
     QNetworkReply* reply = networkAccessManager.get(request);
     connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));

interface/src/ui/AddressBarDialog.cpp

@@ -26,7 +26,7 @@ AddressBarDialog::AddressBarDialog() :
 void AddressBarDialog::setupUI() {
     
     const QString DIALOG_STYLESHEET = "font-family: Helvetica, Arial, sans-serif;";
-    const QString ADDRESSBAR_PLACEHOLDER = "Go to: domain, @user, #location";
+    const QString ADDRESSBAR_PLACEHOLDER = "Go to: domain, location, @user, /x,y,z";
     const QString ADDRESSBAR_STYLESHEET = "padding: 5px 10px; font-size: 20px;";
     
     const int ADDRESSBAR_MIN_WIDTH = 200;

interface/src/ui/ModelsBrowser.cpp

@@ -221,7 +221,7 @@ void ModelHandler::update() {
     }
     for (int i = 0; i < _model.rowCount(); ++i) {
         QUrl url(_model.item(i,0)->data(Qt::UserRole).toString());
-        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkRequest request(url);
         QNetworkReply* reply = networkAccessManager.head(request);
         connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));
@@ -272,7 +272,7 @@ void ModelHandler::queryNewFiles(QString marker) {
     
     // Download
     url.setQuery(query);
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkRequest request(url);
     QNetworkReply* reply = networkAccessManager.get(request);
     connect(reply, SIGNAL(finished()), SLOT(downloadFinished()));

interface/src/ui/ScriptEditorWidget.cpp

@@ -150,7 +150,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) {
             disconnect(_scriptEngine, &ScriptEngine::finished, this, &ScriptEditorWidget::onScriptFinished);
         }
     } else {
-        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
         qDebug() << "Downloading included script at" << scriptPath;
         QEventLoop loop;

interface/src/ui/overlays/Circle3DOverlay.cpp

@@ -21,8 +21,15 @@ Circle3DOverlay::Circle3DOverlay() :
     _startAt(0.0f),
     _endAt(360.0f),
     _outerRadius(1.0f),
-    _innerRadius(0.0f)
+    _innerRadius(0.0f),
+    _hasTickMarks(false),
+    _majorTickMarksAngle(0.0f),
+    _minorTickMarksAngle(0.0f),
+    _majorTickMarksLength(0.0f),
+    _minorTickMarksLength(0.0f)
 {
+    _majorTickMarksColor.red = _majorTickMarksColor.green = _majorTickMarksColor.blue = (unsigned char)0;
+    _minorTickMarksColor.red = _minorTickMarksColor.green = _minorTickMarksColor.blue = (unsigned char)0;
 }
 
 Circle3DOverlay::~Circle3DOverlay() {
@@ -142,6 +149,66 @@ void Circle3DOverlay::render() {
                 glVertex2f(lastOuterPoint.x, lastOuterPoint.y);
                 glEnd();
             }
+            
+            // draw our tick marks
+            // for our overlay, is solid means we draw a ring between the inner and outer radius of the circle, otherwise
+            // we just draw a line...
+            if (getHasTickMarks()) {
+                glBegin(GL_LINES);
+
+                // draw our major tick marks
+                if (getMajorTickMarksAngle() > 0.0f && getMajorTickMarksLength() != 0.0f) {
+                
+                    xColor color = getMajorTickMarksColor();
+                    glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
+                
+                    float angle = startAt;
+                    float angleInRadians = glm::radians(angle);
+                    float tickMarkLength = getMajorTickMarksLength();
+                    float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius;
+                    float endRadius = startRadius + tickMarkLength;
+
+                    while (angle <= endAt) {
+                        angleInRadians = glm::radians(angle);
+
+                        glm::vec2 thisPointA(cos(angleInRadians) * startRadius, sin(angleInRadians) * startRadius);
+                        glm::vec2 thisPointB(cos(angleInRadians) * endRadius, sin(angleInRadians) * endRadius);
+
+                        glVertex2f(thisPointA.x, thisPointA.y);
+                        glVertex2f(thisPointB.x, thisPointB.y);
+                
+                        angle += getMajorTickMarksAngle();
+                    }
+                }
+
+                // draw our minor tick marks
+                if (getMinorTickMarksAngle() > 0.0f && getMinorTickMarksLength() != 0.0f) {
+                
+                    xColor color = getMinorTickMarksColor();
+                    glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
+                
+                    float angle = startAt;
+                    float angleInRadians = glm::radians(angle);
+                    float tickMarkLength = getMinorTickMarksLength();
+                    float startRadius = (tickMarkLength > 0.0f) ? innerRadius : outerRadius;
+                    float endRadius = startRadius + tickMarkLength;
+
+                    while (angle <= endAt) {
+                        angleInRadians = glm::radians(angle);
+
+                        glm::vec2 thisPointA(cos(angleInRadians) * startRadius, sin(angleInRadians) * startRadius);
+                        glm::vec2 thisPointB(cos(angleInRadians) * endRadius, sin(angleInRadians) * endRadius);
+
+                        glVertex2f(thisPointA.x, thisPointA.y);
+                        glVertex2f(thisPointB.x, thisPointB.y);
+                
+                        angle += getMinorTickMarksAngle();
+                    }
+                }
+
+                glEnd();
+            }
+            
  
         glPopMatrix();
     glPopMatrix();
@@ -173,6 +240,55 @@ void Circle3DOverlay::setProperties(const QScriptValue &properties) {
     if (innerRadius.isValid()) {
         setInnerRadius(innerRadius.toVariant().toFloat());
     }
+
+    QScriptValue hasTickMarks = properties.property("hasTickMarks");
+    if (hasTickMarks.isValid()) {
+        setHasTickMarks(hasTickMarks.toVariant().toBool());
+    }
+
+    QScriptValue majorTickMarksAngle = properties.property("majorTickMarksAngle");
+    if (majorTickMarksAngle.isValid()) {
+        setMajorTickMarksAngle(majorTickMarksAngle.toVariant().toFloat());
+    }
+
+    QScriptValue minorTickMarksAngle = properties.property("minorTickMarksAngle");
+    if (minorTickMarksAngle.isValid()) {
+        setMinorTickMarksAngle(minorTickMarksAngle.toVariant().toFloat());
+    }
+
+    QScriptValue majorTickMarksLength = properties.property("majorTickMarksLength");
+    if (majorTickMarksLength.isValid()) {
+        setMajorTickMarksLength(majorTickMarksLength.toVariant().toFloat());
+    }
+
+    QScriptValue minorTickMarksLength = properties.property("minorTickMarksLength");
+    if (minorTickMarksLength.isValid()) {
+        setMinorTickMarksLength(minorTickMarksLength.toVariant().toFloat());
+    }
+
+    QScriptValue majorTickMarksColor = properties.property("majorTickMarksColor");
+    if (majorTickMarksColor.isValid()) {
+        QScriptValue red = majorTickMarksColor.property("red");
+        QScriptValue green = majorTickMarksColor.property("green");
+        QScriptValue blue = majorTickMarksColor.property("blue");
+        if (red.isValid() && green.isValid() && blue.isValid()) {
+            _majorTickMarksColor.red = red.toVariant().toInt();
+            _majorTickMarksColor.green = green.toVariant().toInt();
+            _majorTickMarksColor.blue = blue.toVariant().toInt();
+        }
+    }
+
+    QScriptValue minorTickMarksColor = properties.property("minorTickMarksColor");
+    if (minorTickMarksColor.isValid()) {
+        QScriptValue red = minorTickMarksColor.property("red");
+        QScriptValue green = minorTickMarksColor.property("green");
+        QScriptValue blue = minorTickMarksColor.property("blue");
+        if (red.isValid() && green.isValid() && blue.isValid()) {
+            _minorTickMarksColor.red = red.toVariant().toInt();
+            _minorTickMarksColor.green = green.toVariant().toInt();
+            _minorTickMarksColor.blue = blue.toVariant().toInt();
+        }
+    }
 }
 
 

interface/src/ui/overlays/Circle3DOverlay.h

@@ -26,17 +26,38 @@ public:
     float getEndAt() const { return _endAt; }
     float getOuterRadius() const { return _outerRadius; }
     float getInnerRadius() const { return _innerRadius; }
+    bool getHasTickMarks() const { return _hasTickMarks; }
+    float getMajorTickMarksAngle() const { return _majorTickMarksAngle; }
+    float getMinorTickMarksAngle() const { return _minorTickMarksAngle; }
+    float getMajorTickMarksLength() const { return _majorTickMarksLength; }
+    float getMinorTickMarksLength() const { return _minorTickMarksLength; }
+    xColor getMajorTickMarksColor() const { return _majorTickMarksColor; }
+    xColor getMinorTickMarksColor() const { return _minorTickMarksColor; }
     
     void setStartAt(float value) { _startAt = value; }
     void setEndAt(float value) { _endAt = value; }
     void setOuterRadius(float value) { _outerRadius = value; }
     void setInnerRadius(float value) { _innerRadius = value; }
+    void setHasTickMarks(bool value) { _hasTickMarks = value; }
+    void setMajorTickMarksAngle(float value) { _majorTickMarksAngle = value; }
+    void setMinorTickMarksAngle(float value) { _minorTickMarksAngle = value; }
+    void setMajorTickMarksLength(float value) { _majorTickMarksLength = value; }
+    void setMinorTickMarksLength(float value) { _minorTickMarksLength = value; }
+    void setMajorTickMarksColor(const xColor& value) { _majorTickMarksColor = value; }
+    void setMinorTickMarksColor(const xColor& value) { _minorTickMarksColor = value; }
     
 protected:
     float _startAt;
     float _endAt;
     float _outerRadius;
     float _innerRadius;
+    bool _hasTickMarks;
+    float _majorTickMarksAngle;
+    float _minorTickMarksAngle;
+    float _majorTickMarksLength;
+    float _minorTickMarksLength;
+    xColor _majorTickMarksColor;
+    xColor _minorTickMarksColor;
 };
 
  

interface/src/ui/overlays/ImageOverlay.cpp

@@ -37,7 +37,7 @@ ImageOverlay::~ImageOverlay() {
 // TODO: handle setting image multiple times, how do we manage releasing the bound texture?
 void ImageOverlay::setImageURL(const QUrl& url) {
     _isLoaded = false;
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
     connect(reply, &QNetworkReply::finished, this, &ImageOverlay::replyFinished);
 }

libraries/audio/src/Sound.cpp

@@ -78,7 +78,7 @@ Sound::Sound(const QUrl& sampleURL, bool isStereo, QObject* parent) :
     // assume we have a QApplication or QCoreApplication instance and use the
     // QNetworkAccess manager to grab the raw audio file at the given URL
 
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
 
     qDebug() << "Requesting audio file" << sampleURL.toDisplayString();
     

libraries/avatars/src/AvatarData.cpp

@@ -1048,7 +1048,7 @@ void AvatarData::setBillboardFromURL(const QString &billboardURL) {
     QNetworkRequest billboardRequest;
     billboardRequest.setUrl(QUrl(billboardURL));
     
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
     QNetworkReply* networkReply = networkAccessManager.get(billboardRequest);
     connect(networkReply, SIGNAL(finished()), this, SLOT(setBillboardFromNetworkReply()));
 }
@@ -1113,7 +1113,7 @@ void AvatarData::updateJointMappings() {
     _jointNames.clear();
     
     if (_skeletonModelURL.fileName().toLower().endsWith(".fst")) {
-        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkReply* networkReply = networkAccessManager.get(QNetworkRequest(_skeletonModelURL));
         connect(networkReply, SIGNAL(finished()), this, SLOT(setJointMappingsFromNetworkReply()));
     }

libraries/avatars/src/Recording.cpp

@@ -385,7 +385,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString
     if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
         // Download file if necessary
         qDebug() << "Downloading recording at" << url;
-        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
         QEventLoop loop;
         QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));

libraries/networking/src/AccountManager.cpp

@@ -187,7 +187,7 @@ void AccountManager::invokedRequest(const QString& path,
                                     const JSONCallbackParameters& callbackParams,
                                     const QByteArray& dataByteArray, QHttpMultiPart* dataMultiPart) {
 
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
 
     QNetworkRequest networkRequest;
     
@@ -359,7 +359,7 @@ void AccountManager::setAccessTokenForCurrentAuthURL(const QString& accessToken)
 
 void AccountManager::requestAccessToken(const QString& login, const QString& password) {
 
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
 
     QNetworkRequest request;
 
@@ -431,7 +431,7 @@ void AccountManager::requestAccessTokenError(QNetworkReply::NetworkError error)
 }
 
 void AccountManager::requestProfile() {
-    NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
 
     QUrl profileURL = _authURL;
     profileURL.setPath("/api/v1/users/profile");

libraries/networking/src/DomainHandler.cpp

@@ -90,7 +90,7 @@ void DomainHandler::setSockAddr(const HifiSockAddr& sockAddr, const QString& hos
 void DomainHandler::setUUID(const QUuid& uuid) {
     if (uuid != _uuid) {
         _uuid = uuid;
-        qDebug() << "Domain uuid changed to" << uuidStringWithoutCurlyBraces(_uuid);
+        qDebug() << "Domain ID changed to" << uuidStringWithoutCurlyBraces(_uuid);
     }
 }
 

libraries/networking/src/HifiSockAddr.cpp

@@ -90,32 +90,29 @@ QDataStream& operator>>(QDataStream& dataStream, HifiSockAddr& sockAddr) {
     return dataStream;
 }
 
-quint32 getHostOrderLocalAddress() {
+QHostAddress getLocalAddress() {
     
-    static int localAddress = 0;
+    QHostAddress localAddress;
     
-    if (localAddress == 0) {
+    foreach(const QNetworkInterface &networkInterface, QNetworkInterface::allInterfaces()) {
-        foreach(const QNetworkInterface &networkInterface, QNetworkInterface::allInterfaces()) {
+        if (networkInterface.flags() & QNetworkInterface::IsUp
-            if (networkInterface.flags() & QNetworkInterface::IsUp
+            && networkInterface.flags() & QNetworkInterface::IsRunning
-                && networkInterface.flags() & QNetworkInterface::IsRunning
+            && networkInterface.flags() & ~QNetworkInterface::IsLoopBack) {
-                && networkInterface.flags() & ~QNetworkInterface::IsLoopBack) {
+            // we've decided that this is the active NIC
-                // we've decided that this is the active NIC
+            // enumerate it's addresses to grab the IPv4 address
-                // enumerate it's addresses to grab the IPv4 address
+            foreach(const QNetworkAddressEntry &entry, networkInterface.addressEntries()) {
-                foreach(const QNetworkAddressEntry &entry, networkInterface.addressEntries()) {
+                // make sure it's an IPv4 address that isn't the loopback
-                    // make sure it's an IPv4 address that isn't the loopback
+                if (entry.ip().protocol() == QAbstractSocket::IPv4Protocol && !entry.ip().isLoopback()) {
-                    if (entry.ip().protocol() == QAbstractSocket::IPv4Protocol && !entry.ip().isLoopback()) {
+                    
-                        qDebug("Node's local address is %s", entry.ip().toString().toLocal8Bit().constData());
+                    // set our localAddress and break out
-                        
+                    localAddress = entry.ip();
-                        // set our localAddress and break out
+                    break;
-                        localAddress = entry.ip().toIPv4Address();
-                        break;
-                    }
                 }
             }
-            
+        }
-            if (localAddress != 0) {
+        
-                break;
+        if (!localAddress.isNull()) {
-            }
+            break;
         }
     }
     

libraries/networking/src/HifiSockAddr.h

@@ -58,7 +58,7 @@ private:
 
 uint qHash(const HifiSockAddr& key, uint seed);
 
-quint32 getHostOrderLocalAddress();
+QHostAddress getLocalAddress();
 
 Q_DECLARE_METATYPE(HifiSockAddr)
 

libraries/networking/src/LimitedNodeList.cpp

@@ -70,6 +70,7 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     _nodeHashMutex(QMutex::Recursive),
     _nodeSocket(this),
     _dtlsSocket(NULL),
+    _localSockAddr(),
     _publicSockAddr(),
     _numCollectedPackets(0),
     _numCollectedBytes(0),
@@ -89,6 +90,15 @@ LimitedNodeList::LimitedNodeList(unsigned short socketListenPort, unsigned short
     const int LARGER_BUFFER_SIZE = 1048576;
     changeSocketBufferSizes(LARGER_BUFFER_SIZE);
     
+    // check for local socket updates every so often
+    const int LOCAL_SOCKET_UPDATE_INTERVAL_MSECS = 5 * 1000;
+    QTimer* localSocketUpdate = new QTimer(this);
+    connect(localSocketUpdate, &QTimer::timeout, this, &LimitedNodeList::updateLocalSockAddr);
+    localSocketUpdate->start(LOCAL_SOCKET_UPDATE_INTERVAL_MSECS);
+    
+    // check the local socket right now
+    updateLocalSockAddr();
+    
     _packetStatTimer.start();
 }
 
@@ -570,7 +580,7 @@ void LimitedNodeList::sendSTUNRequest() {
     memcpy(stunRequestPacket + packetIndex, randomUUID.toRfc4122().data(), NUM_TRANSACTION_ID_BYTES);
     
     // lookup the IP for the STUN server
-    static HifiSockAddr stunSockAddr(STUN_SERVER_HOSTNAME, STUN_SERVER_PORT);
+    HifiSockAddr stunSockAddr(STUN_SERVER_HOSTNAME, STUN_SERVER_PORT);
     
     _nodeSocket.writeDatagram((char*) stunRequestPacket, sizeof(stunRequestPacket),
                               stunSockAddr.getAddress(), stunSockAddr.getPort());
@@ -659,6 +669,23 @@ bool LimitedNodeList::processSTUNResponse(const QByteArray& packet) {
     return false;
 }
 
+void LimitedNodeList::updateLocalSockAddr() {
+    HifiSockAddr newSockAddr(getLocalAddress(), _nodeSocket.localPort());
+    if (newSockAddr != _localSockAddr) {
+        
+        if (_localSockAddr.isNull()) {
+            qDebug() << "Local socket is" << newSockAddr;
+        } else {
+            qDebug() << "Local socket has changed from" << _localSockAddr << "to" << newSockAddr;
+        }
+        
+        
+        _localSockAddr = newSockAddr;
+        
+        emit localSockAddrChanged(_localSockAddr);
+    }
+}
+
 void LimitedNodeList::sendHeartbeatToIceServer(const HifiSockAddr& iceServerSockAddr,
                                                QUuid headerID, const QUuid& connectionRequestID) {
     
@@ -669,7 +696,7 @@ void LimitedNodeList::sendHeartbeatToIceServer(const HifiSockAddr& iceServerSock
     QByteArray iceRequestByteArray = byteArrayWithPopulatedHeader(PacketTypeIceServerHeartbeat, headerID);
     QDataStream iceDataStream(&iceRequestByteArray, QIODevice::Append);
     
-    iceDataStream << _publicSockAddr << HifiSockAddr(QHostAddress(getHostOrderLocalAddress()), _nodeSocket.localPort());
+    iceDataStream << _publicSockAddr << _localSockAddr;
     
     if (!connectionRequestID.isNull()) {
         iceDataStream << connectionRequestID;

libraries/networking/src/LimitedNodeList.h

@@ -129,11 +129,15 @@ public slots:
     
     void removeSilentNodes();
     
+    void updateLocalSockAddr();
+    
     void killNodeWithUUID(const QUuid& nodeUUID);
 signals:
     void uuidChanged(const QUuid& ownerUUID, const QUuid& oldUUID);
     void nodeAdded(SharedNodePointer);
     void nodeKilled(SharedNodePointer);
+    
+    void localSockAddrChanged(const HifiSockAddr& localSockAddr);
     void publicSockAddrChanged(const HifiSockAddr& publicSockAddr);
 protected:
     static std::auto_ptr<LimitedNodeList> _sharedInstance;
@@ -155,6 +159,7 @@ protected:
     QMutex _nodeHashMutex;
     QUdpSocket _nodeSocket;
     QUdpSocket* _dtlsSocket;
+    HifiSockAddr _localSockAddr;
     HifiSockAddr _publicSockAddr;
     int _numCollectedPackets;
     int _numCollectedBytes;

libraries/networking/src/NetworkAccessManager.cpp

@@ -13,15 +13,12 @@
 
 #include "NetworkAccessManager.h"
 
-QThreadStorage<NetworkAccessManager*> networkAccessManagers;
+QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 
-NetworkAccessManager& NetworkAccessManager::getInstance() {
+QNetworkAccessManager& NetworkAccessManager::getInstance() {
     if (!networkAccessManagers.hasLocalData()) {
-            networkAccessManagers.setLocalData(new NetworkAccessManager());
+        networkAccessManagers.setLocalData(new QNetworkAccessManager());
     }
     
     return *networkAccessManagers.localData();
 }
-
-NetworkAccessManager::NetworkAccessManager() {
-}

libraries/networking/src/NetworkAccessManager.h

@@ -15,13 +15,10 @@
 #include <QNetworkAccessManager>
 
 /// Wrapper around QNetworkAccessManager to restrict at one instance by thread
-class NetworkAccessManager : public QNetworkAccessManager {
+class NetworkAccessManager : public QObject {
     Q_OBJECT
 public:
-    static NetworkAccessManager& getInstance();
+    static QNetworkAccessManager& getInstance();
-    
-private:
-    NetworkAccessManager();
 };
 
 #endif // hifi_NetworkAccessManager_h

libraries/networking/src/NodeList.cpp

@@ -302,9 +302,7 @@ void NodeList::sendDomainServerCheckIn() {
         QDataStream packetStream(&domainServerPacket, QIODevice::Append);
         
         // pack our data to send to the domain-server
-        packetStream << _ownerType << _publicSockAddr
+        packetStream << _ownerType << _publicSockAddr << _localSockAddr << (quint8) _nodeTypesOfInterest.size();
-        << HifiSockAddr(QHostAddress(getHostOrderLocalAddress()), _nodeSocket.localPort())
-        << (quint8) _nodeTypesOfInterest.size();
         
         // copy over the bytes for node types of interest, if required
         foreach (NodeType_t nodeTypeOfInterest, _nodeTypesOfInterest) {
@@ -420,13 +418,7 @@ void NodeList::sendAssignment(Assignment& assignment) {
     
     packetStream << assignment;
 
-    static HifiSockAddr DEFAULT_ASSIGNMENT_SOCKET(DEFAULT_ASSIGNMENT_SERVER_HOSTNAME, DEFAULT_DOMAIN_SERVER_PORT);
+    _nodeSocket.writeDatagram(packet, _assignmentServerSocket.getAddress(), _assignmentServerSocket.getPort());
-
-    const HifiSockAddr* assignmentServerSocket = _assignmentServerSocket.isNull()
-        ? &DEFAULT_ASSIGNMENT_SOCKET
-        : &_assignmentServerSocket;
-
-    _nodeSocket.writeDatagram(packet, assignmentServerSocket->getAddress(), assignmentServerSocket->getPort());
 }
 
 void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {

libraries/script-engine/src/ScriptEngine.cpp

@@ -157,7 +157,7 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL,
                 emit errorMessage("ERROR Loading file:" + fileName);
             }
         } else {
-            NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+            QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
             QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
             qDebug() << "Downloading script at" << url;
             QEventLoop loop;
@@ -682,7 +682,7 @@ void ScriptEngine::include(const QString& includeFile) {
     QString includeContents;
 
     if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
-        NetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+        QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
         QNetworkReply* reply = networkAccessManager.get(QNetworkRequest(url));
         qDebug() << "Downloading included script at" << includeFile;
         QEventLoop loop;