mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 09:37:29 +02:00
Move one-line method to .h
Moved method to .h f line less than 120 characters Added _lookAtPosition to RecordingFrame
This commit is contained in:
parent
9b87e31739
commit
145e11a478
2 changed files with 16 additions and 35 deletions
|
@ -20,38 +20,16 @@
|
||||||
#include "AvatarData.h"
|
#include "AvatarData.h"
|
||||||
#include "Recorder.h"
|
#include "Recorder.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void RecordingFrame::setBlendshapeCoefficients(QVector<float> blendshapeCoefficients) {
|
void RecordingFrame::setBlendshapeCoefficients(QVector<float> blendshapeCoefficients) {
|
||||||
_blendshapeCoefficients = blendshapeCoefficients;
|
_blendshapeCoefficients = blendshapeCoefficients;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RecordingFrame::setJointRotations(QVector<glm::quat> 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) {
|
Recording::Recording() : _audio(NULL) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,16 +48,18 @@ public:
|
||||||
glm::quat getHeadRotation() const { return _headRotation; }
|
glm::quat getHeadRotation() const { return _headRotation; }
|
||||||
float getLeanSideways() const { return _leanSideways; }
|
float getLeanSideways() const { return _leanSideways; }
|
||||||
float getLeanForward() const { return _leanForward; }
|
float getLeanForward() const { return _leanForward; }
|
||||||
|
glm::vec3 getLookAtPosition() const { return _lookAtPosition; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void setBlendshapeCoefficients(QVector<float> blendshapeCoefficients);
|
void setBlendshapeCoefficients(QVector<float> blendshapeCoefficients);
|
||||||
void setJointRotations(QVector<glm::quat> jointRotations);
|
void setJointRotations(QVector<glm::quat> jointRotations) { _jointRotations = jointRotations; }
|
||||||
void setTranslation(glm::vec3 translation);
|
void setTranslation(glm::vec3 translation) { _translation = translation; }
|
||||||
void setRotation(glm::quat rotation);
|
void setRotation(glm::quat rotation) { _rotation = rotation; }
|
||||||
void setScale(float scale);
|
void setScale(float scale) { _scale = scale; }
|
||||||
void setHeadRotation(glm::quat headRotation);
|
void setHeadRotation(glm::quat headRotation) { _headRotation = headRotation; }
|
||||||
void setLeanSideways(float leanSideways);
|
void setLeanSideways(float leanSideways) { _leanSideways = leanSideways; }
|
||||||
void setLeanForward(float leanForward);
|
void setLeanForward(float leanForward) { _leanForward = leanForward; }
|
||||||
|
void setLookAtPosition(glm::vec3 lookAtPosition) { _lookAtPosition = lookAtPosition; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QVector<float> _blendshapeCoefficients;
|
QVector<float> _blendshapeCoefficients;
|
||||||
|
@ -68,6 +70,7 @@ private:
|
||||||
glm::quat _headRotation;
|
glm::quat _headRotation;
|
||||||
float _leanSideways;
|
float _leanSideways;
|
||||||
float _leanForward;
|
float _leanForward;
|
||||||
|
glm::vec3 _lookAtPosition;
|
||||||
|
|
||||||
friend class Recorder;
|
friend class Recorder;
|
||||||
friend void writeRecordingToFile(RecordingPointer recording, QString file);
|
friend void writeRecordingToFile(RecordingPointer recording, QString file);
|
||||||
|
|
Loading…
Reference in a new issue