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

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-05-14 22:31:35 -05:00
parent 3926d2d30a 4e68f5878a
commit 461ddb2ca9
5 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewerobjectlist.cpp
View File

@@ -980,6 +980,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
// No dead objects, don't need to scan object list.
return;
}
llwarns << "ENTERING LLViewerObjectList::cleanDeadObjects" << llendl;
S32 num_removed = 0;
LLViewerObject *objectp;
@@ -1008,6 +1009,7 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
// before blowing away the dead list.
mDeadObjects.clear();
mNumDeadObjects = 0;
llwarns << "LEAVING LLViewerObjectList::cleanDeadObjects" << llendl;
}
void LLViewerObjectList::updateActive(LLViewerObject *objectp)

2
indra/newview/llviewerwindow.cpp
View File

@@ -553,7 +553,7 @@ public:
}
if (LLPipeline::getRenderSoundBeacons(NULL))
{
addText(xpos, ypos, "Viewing sound beacons (yellow)");
addText(xpos, ypos, "Viewing sound beacons (blue/cyan/green/yellow/red)");
ypos += y_inc;
}
}

28
indra/newview/pipeline.cpp
View File

@@ -2548,8 +2548,32 @@ void LLPipeline::postSort(LLCamera& camera)
LLVector3 pos = gAgent.getPosAgentFromGlobal(pos_global);
if (gPipeline.sRenderBeacons)
{
//pos += LLVector3(0.f, 0.f, 0.2f);
gObjectList.addDebugBeacon(pos, "", LLColor4(1.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f), gSavedSettings.getS32("DebugBeaconLineWidth"));
LLAudioChannel* channel = sourcep->getChannel();
bool const is_playing = channel && channel->isPlaying();
S32 width = 2;
LLColor4 color = LLColor4(0.f, 0.f, 1.f, 0.5f);
if (is_playing)
{
llassert(!sourcep->isMuted());
F32 gain = sourcep->getGain() * channel->getSecondaryGain();
if (gain == 0.f)
{
color = LLColor4(1.f, 0.f, 0.f, 0.5f);
}
else if (gain == 1.f)
{
color = LLColor4(0.f, 1.f, 0.f, 0.5f);
width = gSavedSettings.getS32("DebugBeaconLineWidth");
}
else
{
color = LLColor4(1.f, 1.f, 0.f, 0.5f);
width = 1 + gain * (gSavedSettings.getS32("DebugBeaconLineWidth") - 1);
}
}
else if (sourcep->isMuted())
color = LLColor4(0.f, 1.f, 1.f, 0.5f);
gObjectList.addDebugBeacon(pos, "", color, LLColor4(1.f, 1.f, 1.f, 0.5f), width);
}
}
// now deal with highlights for all those seeable sound sources