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
2438 // Get audio loudness data from audio input device2438 // Get audio loudness data from audio input device
2439 _myAvatar.getHead().setAudioLoudness(_audio.getLastInputLoudness());2439 _myAvatar.getHead().setAudioLoudness(_audio.getLastInputLoudness());
2440 2440
2441 NodeList* nodeList = NodeList::getInstance();
2442
2443 // send head/hand data to the avatar mixer and voxel server2441 // send head/hand data to the avatar mixer and voxel server
2444 unsigned char broadcastString[MAX_PACKET_SIZE];2442 unsigned char broadcastString[MAX_PACKET_SIZE];
2445 unsigned char* endOfBroadcastStringWrite = broadcastString;2443 unsigned char* endOfBroadcastStringWrite = broadcastString;
2446 2444
2447 endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);2445 endOfBroadcastStringWrite += populateTypeAndVersion(endOfBroadcastStringWrite, PACKET_TYPE_HEAD_DATA);
2448 2446
2449 QByteArray ownerUUID = nodeList->getOwnerUUID().toRfc4122();2447 // pack the NodeList owner UUID
2450 memcpy(endOfBroadcastStringWrite, ownerUUID.constData(), ownerUUID.size());2448 endOfBroadcastStringWrite += NodeList::getInstance()->packOwnerUUID(endOfBroadcastStringWrite);
2451 endOfBroadcastStringWrite += ownerUUID.size();
2452 2449
2453 endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);2450 endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite);
2454 2451
@@ -3857,6 +3854,11 @@ void Application::setMenuShortcutsEnabled(bool enabled) { · 1402 unmodified lines
3857void Application::attachNewHeadToNode(Node* newNode) {3854void Application::attachNewHeadToNode(Node* newNode) {
3858 if (newNode->getLinkedData() == NULL) {3855 if (newNode->getLinkedData() == NULL) {
3859 newNode->setLinkedData(new Avatar(newNode));3856 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
3860 }3862 }
3861}3863}
3862 3864

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