diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-25 13:33:46 +0400 |
| commit | 5eecb2ab48547449cfd9d668b92cb257bbd8da86 (patch) | |
| tree | 62600c1a0cf6c64266e324264c5d25dc80e5b188 /intern/itasc/ConstraintSet.cpp | |
| parent | 7c9bb3c40aecbb6e8e8045637c501433eed251f0 (diff) | |
Warning fixes for ITASC. Also, use <stdlib.h> instead of <malloc.h>,
it works everywhere.
Diffstat (limited to 'intern/itasc/ConstraintSet.cpp')
| -rw-r--r-- | intern/itasc/ConstraintSet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/itasc/ConstraintSet.cpp b/intern/itasc/ConstraintSet.cpp index eaffc2a52f9..a38db445ea2 100644 --- a/intern/itasc/ConstraintSet.cpp +++ b/intern/itasc/ConstraintSet.cpp @@ -12,13 +12,13 @@ namespace iTaSC { ConstraintSet::ConstraintSet(unsigned int _nc,double accuracy,unsigned int maximum_iterations): m_nc(_nc), - m_Jf(e_identity_matrix(6,6)), m_Cf(e_zero_matrix(m_nc,6)), - m_U(e_identity_matrix(6,6)),m_V(e_identity_matrix(6,6)),m_B(e_zero_matrix(6,6)), - m_Jf_inv(e_zero_matrix(6,6)), m_Wy(e_scalar_vector(m_nc,1.0)), - m_chi(e_zero_vector(6)),m_y(m_nc),m_ydot(e_zero_vector(m_nc)), + m_y(m_nc),m_ydot(e_zero_vector(m_nc)),m_chi(e_zero_vector(6)), m_S(6),m_temp(6),m_tdelta(6), + m_Jf(e_identity_matrix(6,6)), + m_U(e_identity_matrix(6,6)),m_V(e_identity_matrix(6,6)),m_B(e_zero_matrix(6,6)), + m_Jf_inv(e_zero_matrix(6,6)), m_internalPose(F_identity), m_externalPose(F_identity), m_constraintCallback(NULL), m_constraintParam(NULL), m_toggle(false),m_substep(false), |