Showing the changes to interface/src/DataServerClient.cpp (1 of 106 files). Show all
Unified · Split
| @@ -140,18 +140,18 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 139 unmodified lines | ||
| 140 | 140 | if (keyList[i] == DataServerKey::FaceMeshURL) { |
| 141 | 141 | |
| 142 | 142 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { |
| 143 | − qDebug("Changing user's face model URL to %s\n", valueList[i].toLocal8Bit().constData()); | |
| 143 | + qDebug("Changing user's face model URL to %s", valueList[i].toLocal8Bit().constData()); | |
| 144 | 144 | Application::getInstance()->getProfile()->setFaceModelURL(QUrl(valueList[i])); |
| 145 | 145 | } else { |
| 146 | 146 | // mesh URL for a UUID, find avatar in our list |
| 147 | − NodeList* nodeList = NodeList::getInstance(); | |
| 148 | − for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { | |
| 147 | + | |
| 148 | + foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | |
| 149 | 149 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { |
| 150 | 150 | Avatar* avatar = (Avatar *) node->getLinkedData(); |
| 151 | 151 | |
| 152 | 152 | if (avatar->getUUID() == userUUID) { |
| 153 | 153 | QMetaObject::invokeMethod(&avatar->getHead().getFaceModel(), |
| 154 | − "setURL", Q_ARG(QUrl, QUrl(valueList[i]))); | |
| 154 | + "setURL", Q_ARG(QUrl, QUrl(valueList[i]))); | |
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | } |
| @@ -159,18 +159,17 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 1 unmodified line | ||
| 159 | 159 | } else if (keyList[i] == DataServerKey::SkeletonURL) { |
| 160 | 160 | |
| 161 | 161 | if (userUUID.isNull() || userUUID == Application::getInstance()->getProfile()->getUUID()) { |
| 162 | − qDebug("Changing user's skeleton URL to %s\n", valueList[i].toLocal8Bit().constData()); | |
| 162 | + qDebug("Changing user's skeleton URL to %s", valueList[i].toLocal8Bit().constData()); | |
| 163 | 163 | Application::getInstance()->getProfile()->setSkeletonModelURL(QUrl(valueList[i])); |
| 164 | 164 | } else { |
| 165 | 165 | // skeleton URL for a UUID, find avatar in our list |
| 166 | − NodeList* nodeList = NodeList::getInstance(); | |
| 167 | − for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { | |
| 166 | + foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | |
| 168 | 167 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { |
| 169 | 168 | Avatar* avatar = (Avatar *) node->getLinkedData(); |
| 170 | 169 | |
| 171 | 170 | if (avatar->getUUID() == userUUID) { |
| 172 | 171 | QMetaObject::invokeMethod(&avatar->getSkeletonModel(), "setURL", |
| 173 | − Q_ARG(QUrl, QUrl(valueList[i]))); | |
| 172 | + Q_ARG(QUrl, QUrl(valueList[i]))); | |
| 174 | 173 | } |
| 175 | 174 | } |
| 176 | 175 | } |
| @@ -190,8 +189,8 @@ void DataServerClient::processSendFromDataServer(unsigned char* packetData, int · 13 unmodified lines | ||
| 190 | 189 | qDebug() << "Changing domain to" << valueList[i].toLocal8Bit().constData() << |
| 191 | 190 | ", position to" << valueList[i + 1].toLocal8Bit().constData() << |
| 192 | 191 | ", and orientation to" << valueList[i + 2].toLocal8Bit().constData() << |
| 193 | − "to go to" << userString << "\n"; | |
| 194 | − | |
| 192 | + "to go to" << userString; | |
| 193 | + | |
| 195 | 194 | NodeList::getInstance()->setDomainHostname(valueList[i]); |
| 196 | 195 | // orient the user to face the target |
| 197 | 196 | glm::quat newOrientation = glm::quat(glm::radians(glm::vec3(orientationItems[0].toFloat(), |