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

Less hardcoded element manipluation for media ticker(allows more freedom for skins, etc). Added gridlines to visualizer. Added oscillator color to color tables (This process sucks, btw).

Browse Source
This commit is contained in:
Shyotl
2012-01-04 03:55:53 -06:00
parent af7affa9dd
commit d3ba4a2b80
25 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/shfloatermediaticker.cpp
View File

@@ -23,8 +23,11 @@ SHFloaterMediaTicker::SHFloaterMediaTicker() : LLFloater()/*, LLSingleton<SHFloa
mTitleText(NULL),
mVisualizer(NULL)
{
setIsChrome(TRUE);
LLUICtrlFactory::getInstance()->buildFloater(this, "sh_floater_media_ticker.xml");
setIsChrome(TRUE);
if(gAudiop->getStreamingAudioImpl()->supportsWaveData())
LLUICtrlFactory::getInstance()->buildFloater(this, "sh_floater_media_ticker_visualizer.xml");
else
LLUICtrlFactory::getInstance()->buildFloater(this, "sh_floater_media_ticker.xml");
}
/*virtual*/ BOOL SHFloaterMediaTicker::postBuild()
@@ -35,26 +38,11 @@ SHFloaterMediaTicker::SHFloaterMediaTicker() : LLFloater()/*, LLSingleton<SHFloa
mVisualizer = getChild<LLUICtrl>("visualizer_box",true,false);
mszLoading = getString("loading");
mszPaused = getString("paused");
mOscillatorColor = gColors.getColor("SHMediaTickerOscillatorColor");
if(mArtistText) mArtistText->setText(mszPaused);
if(mTitleText) mTitleText->setText(mszPaused);
if(!gAudiop->getStreamingAudioImpl()->supportsWaveData()) //Can't visualize. Extend textboxes.
{
if(mArtistText)
{
LLRect text_rect = mArtistText->getRect();
text_rect.mRight = llmax(mTickerBackground->getRect().mRight-2,text_rect.mRight);
mArtistText->setRect(text_rect);
}
if(mTitleText)
{
LLRect text_rect = mTitleText->getRect();
text_rect.mRight = llmax(mTickerBackground->getRect().mRight-2,text_rect.mRight);
mArtistText->setRect(text_rect);
}
}
return LLFloater::postBuild();
}
@@ -125,7 +113,7 @@ void SHFloaterMediaTicker::drawOscilloscope() //called via draw.
F32 width_scale = root_rect.getWidth() / (F32)NUM_WAVE_DATA_VALUES;
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
gGL.color4f(0.f,0.f,0.f,.75f);
gGL.color4fv(mOscillatorColor.mV);
gGL.pushMatrix();
gGL.translatef((F32)root_rect.mLeft, (F32)root_rect.mBottom + height*.5f, 0.f);
gGL.begin( LLRender::LINE_STRIP );