From 1b9e6225c8e438d44beb6a993cf1d0f24659d1e0 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 28 Jul 2017 13:39:54 +0100 Subject: SL-763 - added some additional logging related to animation playback speed --- indra/newview/llcontrolavatar.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llcontrolavatar.cpp') diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 8dfc2e81dc..9ed3020b66 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -248,6 +248,10 @@ void LLControlAvatar::updateDebugText() } #endif + addDebugText(llformat("anim time %.1f (step %f factor %f)", + mMotionController.getAnimTime(), + mMotionController.getTimeStep(), + mMotionController.getTimeFactor())); } LLVOAvatar::updateDebugText(); -- cgit v1.2.3 From 912c8faf55a4d391f69eb18d4fda5a85a70de6ca Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Sat, 29 Jul 2017 14:48:43 +0100 Subject: SL-731 - diagnostic displays for LOD, tri count --- indra/newview/llcontrolavatar.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'indra/newview/llcontrolavatar.cpp') diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 9ed3020b66..fb61328a1b 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -212,11 +212,15 @@ void LLControlAvatar::updateDebugText() getAnimatedVolumes(volumes); S32 animated_volume_count = volumes.size(); std::string active_string; + std::string lod_string; + S32 total_tris = 0; for (std::vector::iterator it = volumes.begin(); it != volumes.end(); ++it) { LLVOVolume *volp = *it; - if (volp && volp->mDrawable) + total_tris += volp->getTriangleCount(); + lod_string += llformat("%d",volp->getLOD()); + if (volp && volp->mDrawable) { if (volp->mDrawable->isActive()) { @@ -248,10 +252,13 @@ void LLControlAvatar::updateDebugText() } #endif - addDebugText(llformat("anim time %.1f (step %f factor %f)", - mMotionController.getAnimTime(), - mMotionController.getTimeStep(), - mMotionController.getTimeFactor())); + addDebugText(llformat("lod %s",lod_string.c_str())); + addDebugText(llformat("tris %d", total_tris)); + //addDebugText(llformat("anim time %.1f (step %f factor %f)", + // mMotionController.getAnimTime(), + // mMotionController.getTimeStep(), + // mMotionController.getTimeFactor())); + } LLVOAvatar::updateDebugText(); -- cgit v1.2.3 From a57170724344842e26b8cd0fa4a47c24efa834c5 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 3 Aug 2017 14:23:02 +0100 Subject: SL-731 - render metadata includes triangle count, triangle and vertex count included with debug text for control avatar --- indra/newview/llcontrolavatar.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/llcontrolavatar.cpp') diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index fb61328a1b..d458e2951b 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -214,11 +214,14 @@ void LLControlAvatar::updateDebugText() std::string active_string; std::string lod_string; S32 total_tris = 0; + S32 total_verts = 0; for (std::vector::iterator it = volumes.begin(); it != volumes.end(); ++it) { LLVOVolume *volp = *it; - total_tris += volp->getTriangleCount(); + S32 verts = 0; + total_tris += volp->getTriangleCount(&verts); + total_verts += verts; lod_string += llformat("%d",volp->getLOD()); if (volp && volp->mDrawable) { @@ -253,7 +256,7 @@ void LLControlAvatar::updateDebugText() #endif addDebugText(llformat("lod %s",lod_string.c_str())); - addDebugText(llformat("tris %d", total_tris)); + addDebugText(llformat("tris %d verts %d", total_tris, total_verts)); //addDebugText(llformat("anim time %.1f (step %f factor %f)", // mMotionController.getAnimTime(), // mMotionController.getTimeStep(), -- cgit v1.2.3