OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Merge pull request #291 from Deledrius/plPlate_resizing

Browse Source 
Correct voice chat icon resizing.
This commit is contained in:
Adam Johnson
2013-02-01 17:50:08 -08:00
parent 0f143712af 060c710ab5
commit 804d197714
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Sources/Plasma/PubUtilLib/plAudio/plVoiceChat.cpp
View File

@ -56,7 +56,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plPipeline/plPlates.h" #include "plPipeline/plPlates.h"
#include "plAvatar/plAvatarMgr.h" #include "plAvatar/plAvatarMgr.h"
#include "plAvatar/plArmatureMod.h" #include "plAvatar/plArmatureMod.h"
#include "hsQuat.h"
#include "plAudioCore/plAudioCore.h" #include "plAudioCore/plAudioCore.h"
// DEBUG for printing to the console // DEBUG for printing to the console
@ -74,7 +73,7 @@ bool plVoiceRecorder::fCompress = true;
bool plVoiceRecorder::fRecording = true; bool plVoiceRecorder::fRecording = true;
bool plVoiceRecorder::fNetVoice = false; bool plVoiceRecorder::fNetVoice = false;
short plVoiceRecorder::fSampleRate = FREQUENCY; short plVoiceRecorder::fSampleRate = FREQUENCY;
float plVoiceRecorder::fRecordThreshhold = 200.0f; float plVoiceRecorder::fRecordThreshhold = 200.0f;
bool plVoiceRecorder::fShowIcons = true; bool plVoiceRecorder::fShowIcons = true;
bool plVoiceRecorder::fMicAlwaysOpen = false; bool plVoiceRecorder::fMicAlwaysOpen = false;
bool plVoicePlayer::fEnabled = true; bool plVoicePlayer::fEnabled = true;
@ -84,13 +83,13 @@ plVoiceRecorder::plVoiceRecorder()
plPlateManager::Instance().CreatePlate( &fDisabledIcon ); plPlateManager::Instance().CreatePlate( &fDisabledIcon );
fDisabledIcon->CreateFromResource( MICROPHONE ); fDisabledIcon->CreateFromResource( MICROPHONE );
fDisabledIcon->SetPosition(-0.90, -0.90); fDisabledIcon->SetPosition(-0.90, -0.90);
fDisabledIcon->SetSize(0.0675, 0.09); fDisabledIcon->SetSize(0.064, 0.064, true);
fDisabledIcon->SetVisible(false); fDisabledIcon->SetVisible(false);
plPlateManager::Instance().CreatePlate( &fTalkIcon ); plPlateManager::Instance().CreatePlate( &fTalkIcon );
fTalkIcon->CreateFromResource( TALKING ); fTalkIcon->CreateFromResource( TALKING );
fTalkIcon->SetPosition(-0.9,-0.9); fTalkIcon->SetPosition(-0.9,-0.9);
fTalkIcon->SetSize(0.0675, 0.09); fTalkIcon->SetSize(0.064, 0.064, true);
fTalkIcon->SetVisible(false); fTalkIcon->SetVisible(false);
} }
@ -148,7 +147,7 @@ void plVoiceRecorder::SetQuality(int quality)
} }
else else
{ {
plSpeex::GetInstance()->SetQuality(quality); plSpeex::GetInstance()->SetQuality(quality);
} }
} }
@ -208,13 +207,16 @@ void plVoiceRecorder::DrawDisabledIcon(bool b)
{ {
fDisabledIcon->CreateFromResource( MICROPHONE ); fDisabledIcon->CreateFromResource( MICROPHONE );
fDisabledIcon->SetPosition(-0.90, -0.90); fDisabledIcon->SetPosition(-0.90, -0.90);
fDisabledIcon->SetSize(0.0675, 0.09); fDisabledIcon->SetSize(0.064, 0.064, true);
fDisabledIcon->SetVisible(false); fDisabledIcon->SetVisible(false);
} }
} }
if (fDisabledIcon) if (fDisabledIcon)
{
fDisabledIcon->SetSize(0.064, 0.064, true); // Re-compute plate size in case the aspect ratio has changed.
fDisabledIcon->SetVisible(b); fDisabledIcon->SetVisible(b);
}
} }
void plVoiceRecorder::DrawTalkIcon(bool b) void plVoiceRecorder::DrawTalkIcon(bool b)
@ -225,13 +227,14 @@ void plVoiceRecorder::DrawTalkIcon(bool b)
if (fTalkIcon) if (fTalkIcon)
{ fTalkIcon->CreateFromResource( TALKING ); { fTalkIcon->CreateFromResource( TALKING );
fTalkIcon->SetPosition(-0.9,-0.9); fTalkIcon->SetPosition(-0.9,-0.9);
fTalkIcon->SetSize(0.0675, 0.09); fTalkIcon->SetSize(0.064, 0.064, true);
fTalkIcon->SetVisible(false); fTalkIcon->SetVisible(false);
} }
} }
if (fTalkIcon) if (fTalkIcon)
{ {
fTalkIcon->SetSize(0.064, 0.064, true); // Re-compute plate size in case the aspect ratio has changed.
fTalkIcon->SetVisible(b); fTalkIcon->SetVisible(b);
} }
} }
@ -564,7 +567,7 @@ bool plSpeex::Init(Mode mode)
speex_encoder_ctl(fEncoderState, SPEEX_SET_VBR, &fVBR); // use variable bit rate speex_encoder_ctl(fEncoderState, SPEEX_SET_VBR, &fVBR); // use variable bit rate
speex_encoder_ctl(fEncoderState, SPEEX_SET_ABR, &fAverageBitrate); // default to 8kb speex_encoder_ctl(fEncoderState, SPEEX_SET_ABR, &fAverageBitrate); // default to 8kb
speex_decoder_ctl(fDecoderState, SPEEX_SET_ENH, &fENH); // perceptual enhancement speex_decoder_ctl(fDecoderState, SPEEX_SET_ENH, &fENH); // perceptual enhancement
fInitialized = true; fInitialized = true;
@ -622,7 +625,7 @@ bool plSpeex::Encode(short *data, int numFrames, int *packedLength, hsRAMStream
// write data - length and bytes // write data - length and bytes
out->WriteLE(frameLength); out->WriteLE(frameLength);
*packedLength += sizeof(frameLength); // add length of encoded frame *packedLength += sizeof(frameLength); // add length of encoded frame
out->Write(frameLength, frameData); out->Write(frameLength, frameData);
*packedLength += frameLength; // update length *packedLength += frameLength; // update length

4
Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
View File

@ -123,14 +123,14 @@ void plPlate::SetPosition( float x, float y, float z )
//// SetSize ///////////////////////////////////////////////////////////////// //// SetSize /////////////////////////////////////////////////////////////////
void plPlate::SetSize( float width, float height, bool adjustByAspectRation ) void plPlate::SetSize( float width, float height, bool adjustByAspectRatio )
{ {
hsVector3 size; hsVector3 size;
width *= fDepth / 1.0f; width *= fDepth / 1.0f;
height *= fDepth / 1.0f; height *= fDepth / 1.0f;
size.fX = adjustByAspectRation ? (width * ((float)plPlateManager::Instance().GetPipeHeight() / (float)plPlateManager::Instance().GetPipeWidth())) : width; size.fX = adjustByAspectRatio ? (width * ((float)plPlateManager::Instance().GetPipeHeight() / (float)plPlateManager::Instance().GetPipeWidth())) : width;
size.fY = height; size.fY = height;
size.fZ = 1.0f; size.fZ = 1.0f;