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

domain-server/resources/describe-settings.json

@@ -65,7 +65,7 @@
             {
               "name": "viewpoint",
               "label": "Viewpoint",
-              "placeholder": "/512,512,512"
+              "placeholder": "/0,0,0"
             }
           ]
         }

domain-server/src/DomainServer.cpp

@@ -1868,16 +1868,25 @@ void DomainServer::processPathQueryPacket(QSharedPointer<ReceivedMessage> messag
 
         const QString PATHS_SETTINGS_KEYPATH_FORMAT = "%1.%2";
         const QString PATH_VIEWPOINT_KEY = "viewpoint";
+        const QString INDEX_PATH = "/";
 
         // check out paths in the _configMap to see if we have a match
-        const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(),
-                                                    QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(SETTINGS_PATHS_KEY)
-                                                                                          .arg(pathQuery));
-        if (pathMatch) {
+        auto keypath = QString(PATHS_SETTINGS_KEYPATH_FORMAT).arg(SETTINGS_PATHS_KEY).arg(pathQuery);
+        const QVariant* pathMatch = valueForKeyPath(_settingsManager.getSettingsMap(), keypath);
+
+        if (pathMatch || pathQuery == INDEX_PATH) {
             // we got a match, respond with the resulting viewpoint
             auto nodeList = DependencyManager::get<LimitedNodeList>();
 
-            QString responseViewpoint = pathMatch->toMap()[PATH_VIEWPOINT_KEY].toString();
+            QString responseViewpoint;
+
+            // if we didn't match the path BUT this is for the index path then send back our default
+            if (pathMatch) {
+                responseViewpoint = pathMatch->toMap()[PATH_VIEWPOINT_KEY].toString();
+            } else {
+                const QString DEFAULT_INDEX_PATH = "/0,0,0/0,0,0,1";
+                responseViewpoint = DEFAULT_INDEX_PATH;
+            }
 
             if (!responseViewpoint.isEmpty()) {
                 QByteArray viewpointUTF8 = responseViewpoint.toUtf8();

libraries/entities/src/EntityTree.cpp

@@ -218,7 +218,13 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
         QString collisionSoundURLBefore = entity->getCollisionSoundURL();
         uint32_t preFlags = entity->getDirtyFlags();
 
-        UpdateEntityOperator theOperator(getThisPointer(), containingElement, entity, properties.getQueryAACube());
+        AACube newQueryAACube;
+        if (properties.queryAACubeChanged()) {
+            newQueryAACube = properties.getQueryAACube();
+        } else {
+            newQueryAACube = entity->getQueryAACube();
+        }
+        UpdateEntityOperator theOperator(getThisPointer(), containingElement, entity, newQueryAACube);
         recurseTreeWithOperator(&theOperator);
         entity->setProperties(properties);
 

libraries/entities/src/EntityTreeElement.cpp

@@ -309,29 +309,29 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
                     }
 
                     // Now check the size of the entity, it's possible that a "too small to see" entity is included in a
-                    // larger octree cell because of it's position (for example if it crosses the boundary of a cell it 
-                    // pops to the next higher cell. So we want to check to see that the entity is large enough to be seen 
+                    // larger octree cell because of its position (for example if it crosses the boundary of a cell it
+                    // pops to the next higher cell. So we want to check to see that the entity is large enough to be seen
                     // before we consider including it.
                     if (includeThisEntity) {
                         AABox entityBounds = entity->getAABox(success);
-                        if (success) {
-                            auto renderAccuracy = params.viewFrustum->calculateRenderAccuracy(entityBounds, 
-                                                                            params.octreeElementSizeScale, params.boundaryLevelAdjust);
+                        if (!success) {
+                            // if this entity is a child of an avatar, the entity-server wont be able to determine its
+                            // AABox.  If this happens, fall back to the queryAACube.
+                            entityBounds = AABox(entityCube);
+                        }
+                        auto renderAccuracy = params.viewFrustum->calculateRenderAccuracy(entityBounds,
+                                                                                          params.octreeElementSizeScale,
+                                                                                          params.boundaryLevelAdjust);
+                        if (renderAccuracy <= 0.0f) {
+                            includeThisEntity = false; // too small, don't include it
 
-                            if (renderAccuracy <= 0.0f) {
-                                includeThisEntity = false; // too small, don't include it
-
-                                #ifdef WANT_LOD_DEBUGGING
-                                qDebug() << "skipping entity - TOO SMALL - \n"
-                                         << "......id:" << entity->getID() << "\n" 
-                                         << "....name:" << entity->getName() << "\n"
-                                         << "..bounds:" << entityBounds << "\n"
-                                         << "....cell:" << getAACube();
-                                #endif
-
-                            }
-                        } else {
-                            includeThisEntity = false; // couldn't get box, don't include it
+                            #ifdef WANT_LOD_DEBUGGING
+                            qDebug() << "skipping entity - TOO SMALL - \n"
+                                     << "......id:" << entity->getID() << "\n"
+                                     << "....name:" << entity->getName() << "\n"
+                                     << "..bounds:" << entityBounds << "\n"
+                                     << "....cell:" << getAACube();
+                            #endif
                         }
                     }
                 }

libraries/networking/src/AddressManager.cpp

@@ -149,8 +149,15 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
             // check if it is a network address first
             if (handleNetworkAddress(lookupUrl.host()
                                       + (lookupUrl.port() == -1 ? "" : ":" + QString::number(lookupUrl.port())), trigger)) {
+
+                // if we were not passed a path, use the index path
+                auto path = lookupUrl.path();
+                if (path.isEmpty()) {
+                    path = INDEX_PATH;
+                }
+
                 // we may have a path that defines a relative viewpoint - if so we should jump to that now
-                handlePath(lookupUrl.path(), trigger);
+                handlePath(path, trigger);
             } else if (handleDomainID(lookupUrl.host())){
                 // no place name - this is probably a domain ID
                 // try to look up the domain ID on the metaverse API

libraries/networking/src/NodeList.cpp

@@ -60,7 +60,7 @@ NodeList::NodeList(char newOwnerType, unsigned short socketListenPort, unsigned
 
     // in case we don't know how to talk to DS when a path change is requested
     // fire off any pending DS path query when we get socket information
-    connect(&_domainHandler, &DomainHandler::completedSocketDiscovery, this, &NodeList::sendPendingDSPathQuery);
+    connect(&_domainHandler, &DomainHandler::connectedToDomain, this, &NodeList::sendPendingDSPathQuery);
 
     // send a domain server check in immediately once the DS socket is known
     connect(&_domainHandler, &DomainHandler::completedSocketDiscovery, this, &NodeList::sendDomainServerCheckIn);

server-console/src/main.js

@@ -336,7 +336,7 @@ LogWindow.prototype = {
 
 function goHomeClicked() {
     if (interfacePath) {
-        startInterface('hifi://localhost/7.91966,23.2104,20.7416/0,-0.476144,0,0.879367');
+        startInterface('hifi://localhost');
     } else {
         // show an error to say that we can't go home without an interface instance
         dialog.showErrorBox("Client Not Found", binaryMissingMessage("High Fidelity client", "Interface", false));