From fd1f6befffb942d0e9b2c9e8557c2fc75cbce9cc Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 7 May 2014 15:19:32 -0700 Subject: [PATCH] CR --- assignment-client/src/audio/AudioMixer.cpp | 4 ++-- interface/src/DatagramProcessor.cpp | 4 ++-- interface/src/Menu.cpp | 6 +++--- libraries/networking/src/PacketHeaders.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 9007c55abb..158eabe27b 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -348,9 +348,9 @@ void AudioMixer::readPendingDatagrams() { || mixerPacketType == PacketTypeSilentAudioFrame) { nodeList->findNodeAndUpdateWithDataFromPacket(receivedPacket); - } else if (mixerPacketType == PacketTypeMuteEnvironnement) { + } else if (mixerPacketType == PacketTypeMuteEnvironment) { QByteArray packet = receivedPacket; - populatePacketHeader(packet, PacketTypeMuteEnvironnement); + populatePacketHeader(packet, PacketTypeMuteEnvironment); foreach (const SharedNodePointer& node, nodeList->getNodeHash()) { if (node->getType() == NodeType::Agent && node->getActiveSocket() && node->getLinkedData() && node != nodeList->sendingNodeForPacket(receivedPacket)) { diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp index 5251b5d8ee..56078c1a8d 100644 --- a/interface/src/DatagramProcessor.cpp +++ b/interface/src/DatagramProcessor.cpp @@ -131,11 +131,11 @@ void DatagramProcessor::processDatagrams() { break; } - case PacketTypeMuteEnvironnement: { + case PacketTypeMuteEnvironment: { glm::vec3 position; float radius; - int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironnement); + int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment); memcpy(&position, incomingPacket.constData() + headerSize, sizeof(glm::vec3)); memcpy(&radius, incomingPacket.constData() + headerSize + sizeof(glm::vec3), sizeof(float)); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b98bd985e2..0587e979f6 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -68,7 +68,7 @@ const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f; const float DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER = 1.0f; const int ONE_SECOND_OF_FRAMES = 60; const int FIVE_SECONDS_OF_FRAMES = 5 * ONE_SECOND_OF_FRAMES; -const float MUTE_RADIUS = 10; +const float MUTE_RADIUS = 50; Menu::Menu() : _actionHash(), @@ -1007,13 +1007,13 @@ void Menu::multipleDestinationsDecision(const QJsonObject& userData, const QJson } void Menu::muteEnvironment() { - int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironnement); + int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment); int packetSize = headerSize + sizeof(glm::vec3) + sizeof(float); glm::vec3 position = Application::getInstance()->getAvatar()->getPosition(); char* packet = (char*)malloc(packetSize); - populatePacketHeader(packet, PacketTypeMuteEnvironnement); + populatePacketHeader(packet, PacketTypeMuteEnvironment); memcpy(packet + headerSize, &position, sizeof(glm::vec3)); memcpy(packet + headerSize + sizeof(glm::vec3), &MUTE_RADIUS, sizeof(float)); diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h index ac8a187034..d5b1e8301c 100644 --- a/libraries/networking/src/PacketHeaders.h +++ b/libraries/networking/src/PacketHeaders.h @@ -39,7 +39,7 @@ enum PacketType { PacketTypeRequestAssignment, PacketTypeCreateAssignment, PacketTypeDomainOAuthRequest, - PacketTypeMuteEnvironnement, + PacketTypeMuteEnvironment, PacketTypeDataServerSend, // reusable PacketTypeDataServerConfirm, PacketTypeVoxelQuery,