diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-07 20:27:13 +0000 |
| commit | b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f (patch) | |
| tree | c45377783f53f033d43a4d06d36bbeb2a7f7e79b /indra/llcharacter/llpose.h | |
| parent | a64f283477ea4db09c8b515ab94709e1fb5c82af (diff) | |
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
Diffstat (limited to 'indra/llcharacter/llpose.h')
| -rw-r--r-- | indra/llcharacter/llpose.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h index fe0a23887d..5ba579a167 100644 --- a/indra/llcharacter/llpose.h +++ b/indra/llcharacter/llpose.h @@ -52,7 +52,7 @@ class LLPose { friend class LLPoseBlender; protected: - typedef std::map<std::string, LLJointState*> joint_map; + typedef std::map<std::string, LLPointer<LLJointState> > joint_map; typedef joint_map::iterator joint_map_iterator; typedef joint_map::value_type joint_map_value_type; @@ -61,19 +61,19 @@ protected: joint_map_iterator mListIter; public: // Iterate through jointStates - LLJointState *getFirstJointState(); - LLJointState *getNextJointState(); - LLJointState *findJointState(LLJoint *joint); - LLJointState *findJointState(const std::string &name); + LLJointState* getFirstJointState(); + LLJointState* getNextJointState(); + LLJointState* findJointState(LLJoint *joint); + LLJointState* findJointState(const std::string &name); public: // Constructor LLPose() : mWeight(0.f) {} // Destructor ~LLPose(); // add a joint state in this pose - BOOL addJointState(LLJointState *jointState); + BOOL addJointState(const LLPointer<LLJointState>& jointState); // remove a joint state from this pose - BOOL removeJointState(LLJointState *jointState); + BOOL removeJointState(const LLPointer<LLJointState>& jointState); // removes all joint states from this pose BOOL removeAllJointStates(); // set weight for all joint states in this pose @@ -89,14 +89,14 @@ const S32 JSB_NUM_JOINT_STATES = 6; class LLJointStateBlender { protected: - LLJointState* mJointStates[JSB_NUM_JOINT_STATES]; + LLPointer<LLJointState> mJointStates[JSB_NUM_JOINT_STATES]; S32 mPriorities[JSB_NUM_JOINT_STATES]; BOOL mAdditiveBlends[JSB_NUM_JOINT_STATES]; public: LLJointStateBlender(); ~LLJointStateBlender(); void blendJointStates(BOOL apply_now = TRUE); - BOOL addJointState(LLJointState *joint_state, S32 priority, BOOL additive_blend); + BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend); void interpolate(F32 u); void clear(); void resetCachedJoint(); |