diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-03 22:26:00 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-10-03 22:26:00 +0100 |
| commit | 36c44242133697611216375c94d637ef88cd66cc (patch) | |
| tree | a1b05fd9bea575436f2a4b40535b94e9f6b93da7 /indra/newview/llvoavatar.cpp | |
| parent | 217df36656fb1a3d309fa0b42de192c369309211 (diff) | |
SL-808 - more work on arc display. area calculations still have some issues, especially for animated objects.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index d5301c38ba..e849e14a5b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -620,6 +620,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, LLViewerObject(id, pcode, regionp), mSpecialRenderMode(0), mAttachmentSurfaceArea(0.f), + mDirectAttachmentSurfaceArea(0.f), mAttachmentVisibleTriangleCount(0), mAttachmentEstTriangleCount(0.f), mReportedVisualComplexity(VISUAL_COMPLEXITY_UNKNOWN), @@ -9230,12 +9231,14 @@ void LLVOAvatar::idleUpdateRenderComplexity() mText->addLine(info_line, info_color, info_style); // Triangle count - mText->addLine(llformat("Tris %u",mAttachmentVisibleTriangleCount), info_color, info_style); - mText->addLine(llformat("Est Tris %f",mAttachmentEstTriangleCount), info_color, info_style); + mText->addLine(std::string("VisTris ") + LLStringOps::getReadableNumber(mAttachmentVisibleTriangleCount), + info_color, info_style); + mText->addLine(std::string("EstMaxTris ") + LLStringOps::getReadableNumber(mAttachmentEstTriangleCount), + info_color, info_style); // Attachment Surface Area static LLCachedControl<F32> max_attachment_area(gSavedSettings, "RenderAutoMuteSurfaceAreaLimit", 1000.0f); - info_line = llformat("%.0f m^2", mAttachmentSurfaceArea); + info_line = llformat("%.0f m^2 (%.0f)", mAttachmentSurfaceArea, mDirectAttachmentSurfaceArea); if (max_render_cost != 0 && max_attachment_area != 0) // zero means don't care, so don't bother coloring based on this { @@ -9288,6 +9291,7 @@ void LLVOAvatar::accountRenderComplexityForObject( { mAttachmentVisibleTriangleCount += attached_object->recursiveGetTriangleCount(); mAttachmentEstTriangleCount += attached_object->recursiveGetEstTrianglesMax(); + mDirectAttachmentSurfaceArea += attached_object->recursiveGetScaledSurfaceArea(); textures.clear(); const LLDrawable* drawable = attached_object->mDrawable; @@ -9441,7 +9445,8 @@ void LLVOAvatar::calculateUpdateRenderComplexity() mAttachmentVisibleTriangleCount = 0; mAttachmentEstTriangleCount = 0.f; - + mDirectAttachmentSurfaceArea = 0.f; + // A standalone animated object needs to be accounted for // using its associated volume. Attached animated objects // will be covered by the subsequent loop over attachments. |