diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:32:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-20 05:32:13 +0400 |
commit | bc69b3a8df49ca6207edd2e2b0fdfe6dc0c32ec2 (patch) | |
tree | 894dc08149f28ef67d50f99dbc949bbc1dec165b /intern/iksolver | |
parent | 25c96bc9f348814d50095710c30ddc2776f5bb12 (diff) |
style cleanup
Diffstat (limited to 'intern/iksolver')
-rw-r--r-- | intern/iksolver/intern/IK_QJacobianSolver.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QSegment.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QTask.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_Solver.cpp | 2 | ||||
-rw-r--r-- | intern/iksolver/intern/MT_ExpMap.h | 4 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/cmat.h | 2 | ||||
-rw-r--r-- | intern/iksolver/intern/TNT/vec.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/intern/iksolver/intern/IK_QJacobianSolver.h b/intern/iksolver/intern/IK_QJacobianSolver.h index ead2b150b40..646f952b9ff 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.h +++ b/intern/iksolver/intern/IK_QJacobianSolver.h @@ -53,12 +53,12 @@ class IK_QJacobianSolver { public: IK_QJacobianSolver(); - ~IK_QJacobianSolver() {}; + ~IK_QJacobianSolver() {} // setup pole vector constraint void SetPoleVectorConstraint(IK_QSegment *tip, MT_Vector3& goal, MT_Vector3& polegoal, float poleangle, bool getangle); - float GetPoleAngle() { return m_poleangle; }; + float GetPoleAngle() { return m_poleangle; } // call setup once before solving, if it fails don't solve bool Setup(IK_QSegment *root, std::list<IK_QTask*>& tasks); diff --git a/intern/iksolver/intern/IK_QSegment.h b/intern/iksolver/intern/IK_QSegment.h index 25a8fbc0804..b40bf3739ff 100644 --- a/intern/iksolver/intern/IK_QSegment.h +++ b/intern/iksolver/intern/IK_QSegment.h @@ -158,10 +158,10 @@ public: virtual void UpdateAngleApply()=0; // set joint limits - virtual void SetLimit(int, MT_Scalar, MT_Scalar) {}; + virtual void SetLimit(int, MT_Scalar, MT_Scalar) {} // set joint weights (per axis) - virtual void SetWeight(int, MT_Scalar) {}; + virtual void SetWeight(int, MT_Scalar) {} virtual void SetBasis(const MT_Matrix3x3& basis) { m_basis = basis; } diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h index 45b1e59e606..baf1c346d62 100644 --- a/intern/iksolver/intern/IK_QTask.h +++ b/intern/iksolver/intern/IK_QTask.h @@ -49,7 +49,7 @@ public: bool active, const IK_QSegment *segment ); - virtual ~IK_QTask() {}; + virtual ~IK_QTask() {} int Id() const { return m_size; } @@ -119,7 +119,7 @@ public: const MT_Matrix3x3& goal ); - MT_Scalar Distance() const { return m_distance; }; + MT_Scalar Distance() const { return m_distance; } void ComputeJacobian(IK_QJacobian& jacobian); private: diff --git a/intern/iksolver/intern/IK_Solver.cpp b/intern/iksolver/intern/IK_Solver.cpp index ef4ab1f2f91..c1a4ffcb1e8 100644 --- a/intern/iksolver/intern/IK_Solver.cpp +++ b/intern/iksolver/intern/IK_Solver.cpp @@ -43,7 +43,7 @@ using namespace std; class IK_QSolver { public: IK_QSolver() : root(NULL) { - }; + } IK_QJacobianSolver solver; IK_QSegment *root; diff --git a/intern/iksolver/intern/MT_ExpMap.h b/intern/iksolver/intern/MT_ExpMap.h index 9485428dc9f..65bbe4d4ad5 100644 --- a/intern/iksolver/intern/MT_ExpMap.h +++ b/intern/iksolver/intern/MT_ExpMap.h @@ -103,7 +103,7 @@ public: const MT_Quaternion &q ) { setRotation(q); - }; + } /** * Accessors @@ -118,7 +118,7 @@ public: vector( ) const { return m_v; - }; + } /** * Set the exponential map from a quaternion diff --git a/intern/iksolver/intern/TNT/cmat.h b/intern/iksolver/intern/TNT/cmat.h index 146afdc79d7..fd3a1851262 100644 --- a/intern/iksolver/intern/TNT/cmat.h +++ b/intern/iksolver/intern/TNT/cmat.h @@ -182,7 +182,7 @@ class Matrix // constructors - Matrix() : m_(0), n_(0), mn_(0), v_(0), row_(0), vm1_(0), rowm1_(0) {}; + Matrix() : m_(0), n_(0), mn_(0), v_(0), row_(0), vm1_(0), rowm1_(0) {} Matrix(const Matrix<T> &A) { diff --git a/intern/iksolver/intern/TNT/vec.h b/intern/iksolver/intern/TNT/vec.h index ff1b5c0ea0e..5d4ef14bf73 100644 --- a/intern/iksolver/intern/TNT/vec.h +++ b/intern/iksolver/intern/TNT/vec.h @@ -164,7 +164,7 @@ class Vector // constructors - Vector() : v_(0), vm1_(0), n_(0) {}; + Vector() : v_(0), vm1_(0), n_(0) {} Vector(const Vector<T> &A) : v_(0), vm1_(0), n_(0) { |