Commit 66fb9a06 authored by Jan Möbius's avatar Jan Möbius
Browse files

Next try

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14815 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 589e5456
...@@ -180,9 +180,6 @@ PoseT<PointT>* InterpolationAnimationT<PointT>::pose(unsigned int _iFrame, Pose* ...@@ -180,9 +180,6 @@ PoseT<PointT>* InterpolationAnimationT<PointT>::pose(unsigned int _iFrame, Pose*
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
/**
* @brief Returns the number of frames stored in this pose
*/
template<class PointT> template<class PointT>
unsigned int InterpolationAnimationT<PointT>::frameCount() unsigned int InterpolationAnimationT<PointT>::frameCount()
{ {
...@@ -191,14 +188,6 @@ unsigned int InterpolationAnimationT<PointT>::frameCount() ...@@ -191,14 +188,6 @@ unsigned int InterpolationAnimationT<PointT>::frameCount()
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
/**
* @brief Called by the skeleton as a new joint is inserted
*
* The call is dispatched to all poses stored in this animation. See BasePoseT::insert_at for more information.
*
* @param _index The new joint is inserted at this position. Insert new joints at the end by passing
* SkeletonT::joints_.size as parameter.
*/
template<class PointT> template<class PointT>
void InterpolationAnimationT<PointT>::insertJointAt(unsigned int _index) void InterpolationAnimationT<PointT>::insertJointAt(unsigned int _index)
{ {
......
...@@ -106,6 +106,10 @@ class InterpolationAnimationT : public AnimationT<PointT> ...@@ -106,6 +106,10 @@ class InterpolationAnimationT : public AnimationT<PointT>
virtual Pose* pose(unsigned int _iFrame); virtual Pose* pose(unsigned int _iFrame);
virtual Pose* pose(unsigned int _iFrame, Pose* _reference); virtual Pose* pose(unsigned int _iFrame, Pose* _reference);
/**
* @brief Returns the number of frames stored in this pose
*/
inline unsigned int frameCount(); inline unsigned int frameCount();
/** @} */ /** @} */
...@@ -118,6 +122,12 @@ class InterpolationAnimationT : public AnimationT<PointT> ...@@ -118,6 +122,12 @@ class InterpolationAnimationT : public AnimationT<PointT>
* @{ */ * @{ */
//=========================================================================== //===========================================================================
/** \brief Called by the skeleton as a new joint is inserted
*
* The call is dispatched to all poses stored in the animation. See BaseNode::insert_at for more information.
*
* @param _index The new joint is inserted at this position. Insert new joints at the end by passing SkeletonT::joints_.size as parameter.
*/
virtual void insertJointAt(unsigned int _index); virtual void insertJointAt(unsigned int _index);
virtual void removeJointAt(unsigned int _index); virtual void removeJointAt(unsigned int _index);
......
...@@ -54,7 +54,7 @@ class MultiInterpolationAnimationT : public InterpolationAnimationT<PointT> ...@@ -54,7 +54,7 @@ class MultiInterpolationAnimationT : public InterpolationAnimationT<PointT>
public: public:
typedef PointT Point; typedef PointT Point;
typedef typename Point::value_type Scalar; typedef typename Point::value_type Scalar;
typedef PoseT<PointT> Pose; ///< Typedef for the pose template typedef PoseT<PointT> Pose; ///< Typedef for the pose template
typedef InterpolationMatrixManipulatorT<Scalar> MatrixManipulator; typedef InterpolationMatrixManipulatorT<Scalar> MatrixManipulator;
typedef InterpolationT<Scalar> Interpolator; typedef InterpolationT<Scalar> Interpolator;
typedef std::vector<Scalar> TargetType; typedef std::vector<Scalar> TargetType;
......
Markdown is supported
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