Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a third option to hear voice from everywhere so position does not affect volume/panning.

Browse Source
This commit is contained in:
TighMacFanatic
2013-08-17 12:20:03 -04:00
parent c07646ff38
commit 9fc7c84f74
3 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
indra/newview/llvoicevivox.cpp
View File

@@ -2564,41 +2564,44 @@ void LLVivoxVoiceClient::sendPositionalUpdate(void)
stream << "<ListenerPosition>"; stream << "<ListenerPosition>";
LLVector3d earPosition; if (mEarLocation != earLocSpeaker)
LLVector3 earVelocity; {
LLMatrix3 earRot; LLVector3d earPosition;
LLVector3 earVelocity;
LLMatrix3 earRot;
switch(mEarLocation) switch(mEarLocation)
{ {
case earLocCamera: case earLocCamera:
default: default:
earPosition = mCameraPosition; earPosition = mCameraPosition;
earVelocity = mCameraVelocity; earVelocity = mCameraVelocity;
earRot = mCameraRot; earRot = mCameraRot;
break; break;
case earLocAvatar: case earLocAvatar:
earPosition = mAvatarPosition; earPosition = mAvatarPosition;
earVelocity = mAvatarVelocity; earVelocity = mAvatarVelocity;
earRot = mAvatarRot; earRot = mAvatarRot;
break; break;
case earLocMixed: case earLocMixed:
earPosition = mAvatarPosition; earPosition = mAvatarPosition;
earVelocity = mAvatarVelocity; earVelocity = mAvatarVelocity;
earRot = mCameraRot; earRot = mCameraRot;
break; break;
} }
l = earRot.getLeftRow(); l = earRot.getLeftRow();
u = earRot.getUpRow(); u = earRot.getUpRow();
a = earRot.getFwdRow(); a = earRot.getFwdRow();
pos = earPosition; pos = earPosition;
vel = earVelocity; vel = earVelocity;
// LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL; // LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
oldSDKTransform(l, u, a, pos, vel); oldSDKTransform(l, u, a, pos, vel);
}
stream stream
<< "<Position>" << "<Position>"

1
indra/newview/llvoicevivox.h
View File

@@ -786,6 +786,7 @@ private:
{ {
earLocCamera = 0, // ear at camera earLocCamera = 0, // ear at camera
earLocAvatar, // ear at avatar earLocAvatar, // ear at avatar
earLocSpeaker, // eat at speaker, speakers not affected by position
earLocMixed // ear at avatar location/camera direction earLocMixed // ear at avatar location/camera direction
}; };

5
indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
View File

@@ -4,10 +4,11 @@
<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/> <check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
<check_box bottom_delta="-18" follows="top" height="16" name="enable_multivoice_check"/> <check_box bottom_delta="-18" follows="top" height="16" name="enable_multivoice_check"/>
<string value="Allow multiple instances of [APP_NAME] to use voice simultaneously (requires restart)" name="multivoice_label"/> <string value="Allow multiple instances of [APP_NAME] to use voice simultaneously (requires restart)" name="multivoice_label"/>
<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364"> <radio_group bottom_delta="-66" draw_border="false" follows="top" height="60" left_delta="20" name="ear_location" width="364">
<radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item> <radio_item bottom="-19" height="16" left="3" name="0">Hear Voice Chat from camera position.</radio_item>
<radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item> <radio_item bottom="-35" height="16" name="1">Hear Voice Chat from avatar position.</radio_item>
</radio_group> <radio_item bottom="-51" height="16" name="2">Hear Voice Chat equally from everyone.</radio_item>
</radio_group>
<text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text> <text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Push To Talk</text>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check" tool_tip="When enabled, press the push-to-talk trigger to switch your microphone on and off. When disabled, the microphone is off unless the trigger is being held down."/> <check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Use Push-to-Talk in toggle mode" name="push_to_talk_toggle_check" tool_tip="When enabled, press the push-to-talk trigger to switch your microphone on and off. When disabled, the microphone is off unless the trigger is being held down."/>
<text bottom_delta="-20" follows="top" height="16" left_delta="4" name="push_to_talk_label">Push-to-Talk trigger:</text> <text bottom_delta="-20" follows="top" height="16" left_delta="4" name="push_to_talk_label">Push-to-Talk trigger:</text>