aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoicevisualizer.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llvoicevisualizer.h')
-rw-r--r--linden/indra/newview/llvoicevisualizer.h23
1 files changed, 22 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoicevisualizer.h b/linden/indra/newview/llvoicevisualizer.h
index 8b1636f..76eb282 100644
--- a/linden/indra/newview/llvoicevisualizer.h
+++ b/linden/indra/newview/llvoicevisualizer.h
@@ -90,7 +90,9 @@ class LLVoiceVisualizer : public LLHUDEffect
90 void setStopSpeaking(); // tell me when the av stops speaking 90 void setStopSpeaking(); // tell me when the av stops speaking
91 bool getCurrentlySpeaking(); // the get for the above set 91 bool getCurrentlySpeaking(); // the get for the above set
92 VoiceGesticulationLevel getCurrentGesticulationLevel(); // based on voice amplitude, I'll give you the current "energy level" of avatar speech 92 VoiceGesticulationLevel getCurrentGesticulationLevel(); // based on voice amplitude, I'll give you the current "energy level" of avatar speech
93 93 static void setPreferences( );
94 static void lipStringToF32s ( std::string& in_string, F32*& out_F32s, U32& count_F32s ); // convert a string of digits to an array of floats
95 void lipSyncOohAah( F32& ooh, F32& aah );
94 void render(); // inherited from HUD Effect 96 void render(); // inherited from HUD Effect
95 void packData(LLMessageSystem *mesgsys); // inherited from HUD Effect 97 void packData(LLMessageSystem *mesgsys); // inherited from HUD Effect
96 void unpackData(LLMessageSystem *mesgsys, S32 blocknum); // inherited from HUD Effect 98 void unpackData(LLMessageSystem *mesgsys, S32 blocknum); // inherited from HUD Effect
@@ -124,6 +126,7 @@ class LLVoiceVisualizer : public LLHUDEffect
124 }; 126 };
125 127
126 LLFrameTimer mTimer; // so I can ask the current time in seconds 128 LLFrameTimer mTimer; // so I can ask the current time in seconds
129 F64 mStartTime; // time in seconds when speaking started
127 F64 mCurrentTime; // current time in seconds, captured every step 130 F64 mCurrentTime; // current time in seconds, captured every step
128 F64 mPreviousTime; // copy of "current time" from last frame 131 F64 mPreviousTime; // copy of "current time" from last frame
129 SoundSymbol mSoundSymbol; // the sound symbol that appears over the avatar's head 132 SoundSymbol mSoundSymbol; // the sound symbol that appears over the avatar's head
@@ -134,6 +137,24 @@ class LLVoiceVisualizer : public LLHUDEffect
134 F32 mMaxGesticulationAmplitude; // this is the upper-limit of the envelope of detectable gesticulation leves 137 F32 mMaxGesticulationAmplitude; // this is the upper-limit of the envelope of detectable gesticulation leves
135 F32 mMinGesticulationAmplitude; // this is the lower-limit of the envelope of detectable gesticulation leves 138 F32 mMinGesticulationAmplitude; // this is the lower-limit of the envelope of detectable gesticulation leves
136 139
140 //---------------------------------------------------
141 // private static members
142 //---------------------------------------------------
143
144 static BOOL sLipSyncEnabled; // 0 disabled, 1 babble loop
145 static bool sPrefsInitialized; // the first instance will initialize the static members
146 static F32* sOoh; // the babble loop of amplitudes for the ooh morph
147 static F32* sAah; // the babble loop of amplitudes for the ooh morph
148 static U32 sOohs; // the number of entries in the ooh loop
149 static U32 sAahs; // the number of entries in the aah loop
150 static F32 sOohAahRate; // frames per second for the babble loop
151 static F32* sOohPowerTransfer; // the power transfer characteristics for the ooh amplitude
152 static U32 sOohPowerTransfers; // the number of entries in the ooh transfer characteristics
153 static F32 sOohPowerTransfersf; // the number of entries in the ooh transfer characteristics as a float
154 static F32* sAahPowerTransfer; // the power transfer characteristics for the aah amplitude
155 static U32 sAahPowerTransfers; // the number of entries in the aah transfer characteristics
156 static F32 sAahPowerTransfersf; // the number of entries in the aah transfer characteristics as a float
157
137};//----------------------------------------------------------------- 158};//-----------------------------------------------------------------
138 // end of LLVoiceVisualizer class 159 // end of LLVoiceVisualizer class
139//------------------------------------------------------------------ 160//------------------------------------------------------------------