diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-20 13:37:07 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-20 13:37:07 +0100 |
| commit | f954abd9dfbf8f7147e1f5b352c8eadc6a074555 (patch) | |
| tree | 76445938c8da821363627db8d75f88a60b0b91ec /indra/newview | |
| parent | 569ce0b7b88819995968fb5891c4da89233314eb (diff) | |
MAINT-8549, MAINT-8554 - improvements to animesh ARC, restrict joint position overrides to +/-5m
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.h | 1 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index a181d8be9a..e77c7615e9 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -294,7 +294,7 @@ void LLControlAvatar::updateDebugText() active_string.c_str(), (S32) isImpostor(), streaming_cost)); addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str())); 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())); + addDebugText(llformat("pxarea %s rank %d", LLStringOps::getReadableNumber(getPixelArea()).c_str(), getVisibilityRank())); #if 0 std::string region_name = "no region"; if (mRootVolp->getRegion()) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index f00f855160..cccf857eba 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -747,6 +747,7 @@ private: public: BOOL isVisible() const; void setVisibilityRank(U32 rank); + U32 getVisibilityRank() const { return mVisibilityRank; } static S32 sNumVisibleAvatars; // Number of instances of this class /** Appearance ** ** diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ba733f9387..bf646eb44b 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3932,6 +3932,10 @@ F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_v { if (isAnimatedObject() && isRiggedMesh()) { + if (unscaled_value) + { + *unscaled_value = (linkset_base_cost + ANIMATED_OBJECT_COST_PER_KTRI * 0.001 * getEstTrianglesStreamingCost())/0.06; + } return linkset_base_cost + ANIMATED_OBJECT_COST_PER_KTRI * 0.001 * getEstTrianglesStreamingCost(); } else |