From 80b010b199f3a915cab7654ff3eed5b6d7a66e75 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 26 Feb 2016 16:54:00 -0500 Subject: SL-109 WIP - minor code cleanup --- indra/llappearance/llavatarjointmesh.cpp | 50 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 20 deletions(-) (limited to 'indra/llappearance') diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp index 17aa55ca0a..7ca0928171 100644 --- a/indra/llappearance/llavatarjointmesh.cpp +++ b/indra/llappearance/llavatarjointmesh.cpp @@ -41,29 +41,13 @@ #include "llmatrix4a.h" -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// LLAvatarJointMesh::LLSkinJoint -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- +// Utility functions added with Bento to simplify handling of extra +// spine joints, or other new joints internal to the original +// skeleton, and unknown to the system avatar. //----------------------------------------------------------------------------- -// LLSkinJoint -//----------------------------------------------------------------------------- -LLSkinJoint::LLSkinJoint() -{ - mJoint = NULL; -} - +// getBaseSkeletonAncestor() //----------------------------------------------------------------------------- -// ~LLSkinJoint -//----------------------------------------------------------------------------- -LLSkinJoint::~LLSkinJoint() -{ - mJoint = NULL; -} - - LLAvatarJoint *getBaseSkeletonAncestor(LLAvatarJoint* joint) { LLJoint *ancestor = joint->getParent(); @@ -75,6 +59,9 @@ LLAvatarJoint *getBaseSkeletonAncestor(LLAvatarJoint* joint) return (LLAvatarJoint*) ancestor; } +//----------------------------------------------------------------------------- +// totalSkinOffset() +//----------------------------------------------------------------------------- LLVector3 totalSkinOffset(LLAvatarJoint *joint) { LLVector3 totalOffset; @@ -89,6 +76,29 @@ LLVector3 totalSkinOffset(LLAvatarJoint *joint) return totalOffset; } +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +// LLAvatarJointMesh::LLSkinJoint +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// LLSkinJoint +//----------------------------------------------------------------------------- +LLSkinJoint::LLSkinJoint() +{ + mJoint = NULL; +} + +//----------------------------------------------------------------------------- +// ~LLSkinJoint +//----------------------------------------------------------------------------- +LLSkinJoint::~LLSkinJoint() +{ + mJoint = NULL; +} + + //----------------------------------------------------------------------------- // LLSkinJoint::setupSkinJoint() //----------------------------------------------------------------------------- -- cgit v1.2.3