History

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

Philip Rosedale committed 12 years ago

Commit bacfa152 parents 5e4fad2 f4f828a37 files · +146 −324Browse files

Showing the changes to interface/src/Application.cpp (1 of 37 files). Show all

Unified · Split

interface/src/Application.cpp+7−5
@@ -2438,17 +2438,14 @@ void Application::updateAvatar(float deltaTime) { · 2437 unmodified lines
24382438 // Get audio loudness data from audio input device
24392439 _myAvatar.getHead().setAudioLoudness(_audio.getLastInputLoudness());
24402440
2441− NodeList* nodeList = NodeList::getInstance();
2442−
24432441 // send head/hand data to the avatar mixer and voxel server
24442442 unsigned char broadcastString[MAX_PACKET_SIZE];
24452443 unsigned char* endOfBroadcastStringWrite = broadcastString;
24462444
24472445 endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);
24482446
2449− QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();
2450− memcpy(endOfBroadcastStringWrite, ownerUUID.constData(), ownerUUID.size());
2451− endOfBroadcastStringWrite += ownerUUID.size();
2447+ // pack the NodeList owner UUID
2448+ endOfBroadcastStringWrite += NodeList::getInstance()->packOwnerUUID(endOfBroadcastStringWrite);
24522449
24532450 endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
24542451
@@ -3857,6 +3854,11 @@ void Application::setMenuShortcutsEnabled(bool enabled) { · 1402 unmodified lines
38573854 void Application::attachNewHeadToNode(Node* newNode) {
38583855 if (newNode->getLinkedData() == NULL) {
38593856 newNode->setLinkedData(new Avatar(newNode));
3857+
3858+ // new UUID requires mesh and skeleton request to data-server
3859+ DataServerClient::getValuesForKeysAndUUID(QStringList() << DataServerKey::FaceMeshURL << DataServerKey::SkeletonURL,
3860+ newNode->getUUID(), Application::getInstance()->getProfile());
3861+
38603862 }
38613863 }
38623864

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t