diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-10 18:29:52 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-10 18:29:52 +0200 |
| commit | 6a3cb73009bccdef6ae1fbb5d8b632f90343ad91 (patch) | |
| tree | 6fe381474cffb4668cdbfa2d45a77363af4b95c2 /indra/llcharacter | |
| parent | 67b908cd2020231f30386294e4d0c5f199a007a0 (diff) | |
SL-379 Joint overrides tab
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 2 | ||||
| -rw-r--r-- | indra/llcharacter/lljoint.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 441ef1a352..bf99db2ce4 100644 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -407,7 +407,7 @@ void showJointScaleOverrides( const LLJoint& joint, const std::string& note, con bool LLJoint::aboveJointPosThreshold(const LLVector3& pos) const { LLVector3 diff = pos - getDefaultPosition(); - const F32 max_joint_pos_offset = 0.0001f; // 0.1 mm + const F32 max_joint_pos_offset = LL_JOINT_TRESHOLD_POS_OFFSET; // 0.1 mm return diff.lengthSquared() > max_joint_pos_offset * max_joint_pos_offset; } diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 6f69786f53..79d9637f21 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -53,6 +53,8 @@ const U32 LL_FACE_JOINT_NUM = (LL_CHARACTER_MAX_ANIMATED_JOINTS-2); const S32 LL_CHARACTER_MAX_PRIORITY = 7; const F32 LL_MAX_PELVIS_OFFSET = 5.f; +const F32 LL_JOINT_TRESHOLD_POS_OFFSET = 0.0001f; //0.1 mm + class LLVector3OverrideMap { public: |