diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index 32594a7225..296b4ab68a 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -54,7 +54,6 @@ Head::Head(Avatar* owningAvatar) : _deltaRoll(0.0f), _deltaLeanSideways(0.0f), _deltaLeanForward(0.0f), - _torsoTwist(0.0f), _isCameraMoving(false), _isLookingAtMe(false), _faceModel(this), diff --git a/interface/src/avatar/Head.h b/interface/src/avatar/Head.h index dece0a8565..255ea823e9 100644 --- a/interface/src/avatar/Head.h +++ b/interface/src/avatar/Head.h @@ -76,9 +76,6 @@ public: float getFinalLeanSideways() const { return _leanSideways + _deltaLeanSideways; } float getFinalLeanForward() const { return _leanForward + _deltaLeanForward; } - float getTorsoTwist() const { return _torsoTwist; } - void setTorsoTwist(float torsoTwist) { _torsoTwist = torsoTwist; } - glm::quat getEyeRotation(const glm::vec3& eyePosition) const; const glm::vec3& getRightEyePosition() const { return _rightEyePosition; } @@ -151,8 +148,6 @@ private: // delta lean angles for lean perturbations (driven by collisions) float _deltaLeanSideways; float _deltaLeanForward; - - float _torsoTwist; bool _isCameraMoving; bool _isLookingAtMe; diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp index 511ab50c11..5bf33d1153 100644 --- a/libraries/avatars/src/HeadData.cpp +++ b/libraries/avatars/src/HeadData.cpp @@ -24,6 +24,7 @@ HeadData::HeadData(AvatarData* owningAvatar) : _baseRoll(0.0f), _leanSideways(0.0f), _leanForward(0.0f), + _torsoTwist(0.0f), _lookAtPosition(0.0f, 0.0f, 0.0f), _audioLoudness(0.0f), _isFaceshiftConnected(false), diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h index 3a4eb3c808..cef5d5fbca 100644 --- a/libraries/avatars/src/HeadData.h +++ b/libraries/avatars/src/HeadData.h @@ -71,11 +71,13 @@ public: float getLeanSideways() const { return _leanSideways; } float getLeanForward() const { return _leanForward; } + float getTorsoTwist() const { return _torsoTwist; } virtual float getFinalLeanSideways() const { return _leanSideways; } virtual float getFinalLeanForward() const { return _leanForward; } void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; } void setLeanForward(float leanForward) { _leanForward = leanForward; } + void setTorsoTwist(float torsoTwist) { _torsoTwist = torsoTwist; } friend class AvatarData; @@ -86,6 +88,7 @@ protected: float _baseRoll; float _leanSideways; float _leanForward; + float _torsoTwist; glm::vec3 _lookAtPosition; float _audioLoudness;