summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-03-26 20:59:37 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-03-26 20:59:37 +0100
commita3fd0801c3030ff9a5a6761c9618f381aa965983 (patch)
tree2210a497800bdcddadd8c74d0fcabef52a7c8077 /indra/newview/llcontrolavatar.cpp
parent4b7caa244570e0d1a42c5155f8620e05d2a47bad (diff)
SL-897 - display for DebugAnimatedObjects now includes streaming cost triangle count
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index e1715d567b..a16fa3cd26 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -242,7 +242,9 @@ void LLControlAvatar::updateDebugText()
std::string lod_string;
S32 total_tris = 0;
S32 total_verts = 0;
- S32 est_tris = 0;
+ F32 est_tris = 0.f;
+ F32 est_streaming_tris = 0.f;
+
for (std::vector<LLVOVolume*>::iterator it = volumes.begin();
it != volumes.end(); ++it)
{
@@ -251,6 +253,7 @@ void LLControlAvatar::updateDebugText()
total_tris += volp->getTriangleCount(&verts);
total_verts += verts;
est_tris += volp->getEstTrianglesMax();
+ est_streaming_tris += volp->getEstTrianglesStreamingCost();
lod_string += llformat("%d",volp->getLOD());
if (volp && volp->mDrawable)
{
@@ -287,7 +290,7 @@ void LLControlAvatar::updateDebugText()
addDebugText(llformat("CAV obj %d anim %d active %s impost %d",
total_linkset_count, animated_volume_count, active_string.c_str(), (S32) isImpostor()));
addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str()));
- addDebugText(llformat("tris %d (est %d), verts %d", total_tris, est_tris, total_verts));
+ addDebugText(llformat("tris %d (est %.1f, streaming %.1f), verts %d", total_tris, est_tris, est_streaming_tris, total_verts));
addDebugText(llformat("pxarea %s", LLStringOps::getReadableNumber(getPixelArea()).c_str()));
#if 0
std::string region_name = "no region";