Commit 61ae9996 authored by Isaak Lim's avatar Isaak Lim
Browse files

fixed some more SkeletonT doxygen warnings



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15027 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b5b88193
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// ITERATOR - IMPLEMENTATION // ITERATOR - IMPLEMENTATION
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** /**
...@@ -119,7 +119,7 @@ SkeletonT<PointT>::Iterator::~Iterator() ...@@ -119,7 +119,7 @@ SkeletonT<PointT>::Iterator::~Iterator()
* @brief Assignment Operator * @brief Assignment Operator
* *
* Assign values from given iterator to this iterator and also return self * Assign values from given iterator to this iterator and also return self
* *
*/ */
template<typename PointT> template<typename PointT>
typename SkeletonT<PointT>::Iterator &SkeletonT<PointT>::Iterator::operator=(const Iterator &other) typename SkeletonT<PointT>::Iterator &SkeletonT<PointT>::Iterator::operator=(const Iterator &other)
...@@ -219,7 +219,7 @@ typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::Iterator::operator*() cons ...@@ -219,7 +219,7 @@ typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::Iterator::operator*() cons
* *
* This way it is possible to access the joint by calling: * This way it is possible to access the joint by calling:
* @code * @code
* SkeletonT::Iterator it; * SkeletonT<>::Iterator it;
* ... * ...
* it->method(); * it->method();
* @endcode * @endcode
...@@ -236,7 +236,7 @@ typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::Iterator::operator->() con ...@@ -236,7 +236,7 @@ typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::Iterator::operator->() con
* @brief Returns false if the iterator is done iterating * @brief Returns false if the iterator is done iterating
* *
* There are two ways to test if the joint iterator has reached its end. Cast it to bool and test if it is * There are two ways to test if the joint iterator has reached its end. Cast it to bool and test if it is
* false or compare it to the return value of SkeletonT::end. * false or compare it to the return value of SkeletonT<>::end.
*/ */
template<typename PointT> template<typename PointT>
SkeletonT<PointT>::Iterator::operator bool() const SkeletonT<PointT>::Iterator::operator bool() const
...@@ -487,7 +487,7 @@ template<typename PointT> ...@@ -487,7 +487,7 @@ template<typename PointT>
void SkeletonT<PointT>::addJoint(typename SkeletonT<PointT>::Joint *_pParent, typename SkeletonT<PointT>::Joint *_pJoint) void SkeletonT<PointT>::addJoint(typename SkeletonT<PointT>::Joint *_pParent, typename SkeletonT<PointT>::Joint *_pJoint)
{ {
unsigned int newJointID; unsigned int newJointID;
if(_pParent == 0) if(_pParent == 0)
{ {
clear(); clear();
...@@ -626,7 +626,7 @@ inline typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::root() ...@@ -626,7 +626,7 @@ inline typename SkeletonT<PointT>::Joint *SkeletonT<PointT>::root()
/** /**
* @brief Returns the joint with the given index * @brief Returns the joint with the given index
* *
* JointT::id_ is always equal to _index. * JointT<>::id_ is always equal to _index.
* *
* @param _index The joints index, in the range [0, joints_.size) * @param _index The joints index, in the range [0, joints_.size)
* @return Returns a pointer to the joint or 0 if the index does not exist. * @return Returns a pointer to the joint or 0 if the index does not exist.
...@@ -667,7 +667,7 @@ unsigned int SkeletonT<PointT>::childCount(unsigned int _joint) ...@@ -667,7 +667,7 @@ unsigned int SkeletonT<PointT>::childCount(unsigned int _joint)
std::cerr << "SkeletonT : childCount() called with non-existing joint " << _joint << std::endl; std::cerr << "SkeletonT : childCount() called with non-existing joint " << _joint << std::endl;
return 0; return 0;
} }
return joints_[_joint]->size(); return joints_[_joint]->size();
} }
...@@ -745,7 +745,7 @@ inline typename SkeletonT<PointT>::Pose* SkeletonT<PointT>::pose(const Animation ...@@ -745,7 +745,7 @@ inline typename SkeletonT<PointT>::Pose* SkeletonT<PointT>::pose(const Animation
* @brief Returns a pointer to the reference pose * @brief Returns a pointer to the reference pose
* *
* Use this if you need access to the special data members of the reference pose. Notice you can also * Use this if you need access to the special data members of the reference pose. Notice you can also
* get the reference pose by passing AnimationHandle() to the SkeletonT::pose method: * get the reference pose by passing AnimationHandle() to the SkeletonT<>::pose method:
* @code * @code
* skeleton.pose(AnimationHandle()); * skeleton.pose(AnimationHandle());
* @endcode * @endcode
...@@ -783,7 +783,7 @@ AnimationHandle SkeletonT<PointT>::addAnimation(std::string _name, Animation *_a ...@@ -783,7 +783,7 @@ AnimationHandle SkeletonT<PointT>::addAnimation(std::string _name, Animation *_a
names_.insert( std::pair<std::string, unsigned int>(_name, f - animations_.begin()) ); names_.insert( std::pair<std::string, unsigned int>(_name, f - animations_.begin()) );
*f = _animation; *f = _animation;
} }
if (_animation) if (_animation)
_animation->setName(_name); _animation->setName(_name);
...@@ -838,7 +838,7 @@ AnimationHandle SkeletonT<PointT>::animationHandle(std::string _name) ...@@ -838,7 +838,7 @@ AnimationHandle SkeletonT<PointT>::animationHandle(std::string _name)
std::map<std::string, unsigned int>::iterator f = names_.find(_name); std::map<std::string, unsigned int>::iterator f = names_.find(_name);
if(f == names_.end()) if(f == names_.end())
return AnimationHandle(); return AnimationHandle();
return AnimationHandle(f->second); return AnimationHandle(f->second);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment