Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all
Unified · Split
| @@ -1230,15 +1230,19 @@ static Avatar* processAvatarMessageHeader(unsigned char*& packetData, size_t& da · 1229 unmodified lines | |||
| 1230 | return avatar->isInitialized() ? avatar : NULL; | 1230 | return avatar->isInitialized() ? avatar : NULL; |
| 1231 | } | 1231 | } |
| 1232 | 1232 | ||
| 1233 | void Application::processAvatarVoxelURLMessage(unsigned char* packetData, size_t dataBytes) { | 1233 | void Application::processAvatarURLsMessage(unsigned char* packetData, size_t dataBytes) { |
| 1234 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); | 1234 | Avatar* avatar = processAvatarMessageHeader(packetData, dataBytes); |
| 1235 | if (!avatar) { | 1235 | if (!avatar) { |
| 1236 | return; | 1236 | return; |
| 1237 | } | 1237 | } |
| 1238 | QUrl url = QUrl::fromEncoded(QByteArray((char*)packetData, dataBytes)); | 1238 | QDataStream in(QByteArray((char*)packetData, dataBytes)); |
| 1239 | QUrl voxelURL, faceURL; | ||
| 1240 | in >> voxelURL; | ||
| 1241 | in >> faceURL; | ||
| 1239 | 1242 | ||
| 1240 | // invoke the set URL function on the simulate/render thread | 1243 | // invoke the set URL functions on the simulate/render thread |
| 1241 | QMetaObject::invokeMethod(avatar->getVoxels(), "setVoxelURL", Q_ARG(QUrl, url)); | 1244 | QMetaObject::invokeMethod(avatar->getVoxels(), "setVoxelURL", Q_ARG(QUrl, voxelURL)); |
| 1245 | QMetaObject::invokeMethod(&avatar->getHead().getBlendFace(), "setModelURL", Q_ARG(QUrl, faceURL)); | ||
| 1242 | } | 1246 | } |
| 1243 | 1247 | ||
| 1244 | void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) { | 1248 | void Application::processAvatarFaceVideoMessage(unsigned char* packetData, size_t dataBytes) { |
| @@ -1564,8 +1568,8 @@ void Application::init() { · 319 unmodified lines | |||
| 1564 | 1568 | ||
| 1565 | qDebug("Loaded settings.\n"); | 1569 | qDebug("Loaded settings.\n"); |
| 1566 | 1570 | ||
| 1567 | Avatar::sendAvatarVoxelURLMessage(_myAvatar.getVoxels()->getVoxelURL()); | 1571 | Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL(), _myAvatar.getHead().getBlendFace().getModelURL()); |
| 1568 | 1572 | ||
| 1569 | _palette.init(_glWidget->width(), _glWidget->height()); | 1573 | _palette.init(_glWidget->width(), _glWidget->height()); |
| 1570 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0); | 1574 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelAddMode), 0, 0); |
| 1571 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelDeleteMode), 0, 1); | 1575 | _palette.addAction(Menu::getInstance()->getActionForOption(MenuOption::VoxelDeleteMode), 0, 1); |
| @@ -2136,10 +2140,11 @@ void Application::updateAvatar(float deltaTime) { · 564 unmodified lines | |||
| 2136 | controlledBroadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, | 2140 | controlledBroadcastToNodes(broadcastString, endOfBroadcastStringWrite - broadcastString, |
| 2137 | nodeTypesOfInterest, sizeof(nodeTypesOfInterest)); | 2141 | nodeTypesOfInterest, sizeof(nodeTypesOfInterest)); |
| 2138 | 2142 | ||
| 2139 | // once in a while, send my voxel url | 2143 | // once in a while, send my urls |
| 2140 | const float AVATAR_VOXEL_URL_SEND_INTERVAL = 1.0f; // seconds | 2144 | const float AVATAR_URLS_SEND_INTERVAL = 1.0f; // seconds |
| 2141 | if (shouldDo(AVATAR_VOXEL_URL_SEND_INTERVAL, deltaTime)) { | 2145 | if (shouldDo(AVATAR_URLS_SEND_INTERVAL, deltaTime)) { |
| 2142 | Avatar::sendAvatarVoxelURLMessage(_myAvatar.getVoxels()->getVoxelURL()); | 2146 | Avatar::sendAvatarURLsMessage(_myAvatar.getVoxels()->getVoxelURL(), |
| 2147 | _myAvatar.getHead().getBlendFace().getModelURL()); | ||
| 2143 | } | 2148 | } |
| 2144 | } | 2149 | } |
| 2145 | } | 2150 | } |
| @@ -3510,8 +3515,8 @@ void* Application::networkReceive(void* args) { · 1364 unmodified lines | |||
| 3510 | bytesReceived); | 3515 | bytesReceived); |
| 3511 | getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived); | 3516 | getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived); |
| 3512 | break; | 3517 | break; |
| 3513 | case PACKET_TYPE_AVATAR_VOXEL_URL: | 3518 | case PACKET_TYPE_AVATAR_URLS: |
| 3514 | processAvatarVoxelURLMessage(app->_incomingPacket, bytesReceived); | 3519 | processAvatarURLsMessage(app->_incomingPacket, bytesReceived); |
| 3515 | break; | 3520 | break; |
| 3516 | case PACKET_TYPE_AVATAR_FACE_VIDEO: | 3521 | case PACKET_TYPE_AVATAR_FACE_VIDEO: |
| 3517 | processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived); | 3522 | processAvatarFaceVideoMessage(app->_incomingPacket, bytesReceived); |