From dd515f6bb924f31300108183b8ca09815bb6b718 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 28 Jul 2014 07:06:36 -0700 Subject: [PATCH] fix bad variable name --- interface/src/avatar/MuscleConstraint.cpp | 4 ++-- interface/src/avatar/MuscleConstraint.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MuscleConstraint.cpp b/interface/src/avatar/MuscleConstraint.cpp index 570f36b664..f4ba7975d0 100644 --- a/interface/src/avatar/MuscleConstraint.cpp +++ b/interface/src/avatar/MuscleConstraint.cpp @@ -17,13 +17,13 @@ const float DEFAULT_MUSCLE_STRENGTH = 0.5f * MAX_MUSCLE_STRENGTH; MuscleConstraint::MuscleConstraint(VerletPoint* parent, VerletPoint* child) - : _rootPoint(parent), _childoint(child), + : _rootPoint(parent), _childPoint(child), _parentIndex(-1), _childndex(-1), _strength(DEFAULT_MUSCLE_STRENGTH) { _childOffset = child->_position - parent->_position; } float MuscleConstraint::enforce() { - _childoint->_position = (1.0f - _strength) * _childoint->_position + _strength * (_rootPoint->_position + _childOffset); + _childPoint->_position = (1.0f - _strength) * _childPoint->_position + _strength * (_rootPoint->_position + _childOffset); return 0.0f; } diff --git a/interface/src/avatar/MuscleConstraint.h b/interface/src/avatar/MuscleConstraint.h index 461b7c83b9..882b351b80 100644 --- a/interface/src/avatar/MuscleConstraint.h +++ b/interface/src/avatar/MuscleConstraint.h @@ -33,7 +33,7 @@ public: float getStrength() const { return _strength; } private: VerletPoint* _rootPoint; - VerletPoint* _childoint; + VerletPoint* _childPoint; int _parentIndex; int _childndex; glm::vec3 _childOffset;