From 145e11a478890608c04bf9a5c8d38d655f78a6b7 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 15 Sep 2014 19:01:40 -0700 Subject: [PATCH] Move one-line method to .h Moved method to .h f line less than 120 characters Added _lookAtPosition to RecordingFrame --- libraries/avatars/src/Recorder.cpp | 34 ++++++------------------------ libraries/avatars/src/Recorder.h | 17 +++++++++------ 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp index 70568a3487..ce4bd3056d 100644 --- a/libraries/avatars/src/Recorder.cpp +++ b/libraries/avatars/src/Recorder.cpp @@ -20,38 +20,16 @@ #include "AvatarData.h" #include "Recorder.h" + + + +} +} + void RecordingFrame::setBlendshapeCoefficients(QVector blendshapeCoefficients) { _blendshapeCoefficients = blendshapeCoefficients; } -void RecordingFrame::setJointRotations(QVector jointRotations) { - _jointRotations = jointRotations; -} - -void RecordingFrame::setTranslation(glm::vec3 translation) { - _translation = translation; -} - -void RecordingFrame::setRotation(glm::quat rotation) { - _rotation = rotation; -} - -void RecordingFrame::setScale(float scale) { - _scale = scale; -} - -void RecordingFrame::setHeadRotation(glm::quat headRotation) { - _headRotation = headRotation; -} - -void RecordingFrame::setLeanSideways(float leanSideways) { - _leanSideways = leanSideways; -} - -void RecordingFrame::setLeanForward(float leanForward) { - _leanForward = leanForward; -} - Recording::Recording() : _audio(NULL) { } diff --git a/libraries/avatars/src/Recorder.h b/libraries/avatars/src/Recorder.h index 447c3eabe8..a2eb34399b 100644 --- a/libraries/avatars/src/Recorder.h +++ b/libraries/avatars/src/Recorder.h @@ -48,16 +48,18 @@ public: glm::quat getHeadRotation() const { return _headRotation; } float getLeanSideways() const { return _leanSideways; } float getLeanForward() const { return _leanForward; } + glm::vec3 getLookAtPosition() const { return _lookAtPosition; } protected: void setBlendshapeCoefficients(QVector blendshapeCoefficients); - void setJointRotations(QVector jointRotations); - void setTranslation(glm::vec3 translation); - void setRotation(glm::quat rotation); - void setScale(float scale); - void setHeadRotation(glm::quat headRotation); - void setLeanSideways(float leanSideways); - void setLeanForward(float leanForward); + void setJointRotations(QVector jointRotations) { _jointRotations = jointRotations; } + void setTranslation(glm::vec3 translation) { _translation = translation; } + void setRotation(glm::quat rotation) { _rotation = rotation; } + void setScale(float scale) { _scale = scale; } + void setHeadRotation(glm::quat headRotation) { _headRotation = headRotation; } + void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; } + void setLeanForward(float leanForward) { _leanForward = leanForward; } + void setLookAtPosition(glm::vec3 lookAtPosition) { _lookAtPosition = lookAtPosition; } private: QVector _blendshapeCoefficients; @@ -68,6 +70,7 @@ private: glm::quat _headRotation; float _leanSideways; float _leanForward; + glm::vec3 _lookAtPosition; friend class Recorder; friend void writeRecordingToFile(RecordingPointer recording, QString file);