Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 16:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR

Browse source
This commit is contained in:
Atlante45 2014-08-18 15:56:27 -07:00
parent 6d567e67a9
commit 698699dea8
2 changed files with 26 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
interface/src/Recorder.cpp
View file

@ -11,6 +11,8 @@
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <QMetaObject>
#include "Recorder.h" #include "Recorder.h"
void RecordingFrame::setBlendshapeCoefficients(QVector<float> blendshapeCoefficients) { void RecordingFrame::setBlendshapeCoefficients(QVector<float> blendshapeCoefficients) {
@ -179,131 +181,37 @@ qint64 Player::elapsed() const {
} }
} }
QVector<float> Player::getBlendshapeCoefficients() {
computeCurrentFrame();
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) {
if (_currentFrame == _recording->getFrameNumber()) {
return _recording->getFrame(_currentFrame - 1).getBlendshapeCoefficients();
}
return _recording->getFrame(_currentFrame).getBlendshapeCoefficients();
}
qWarning() << "Incorrect use of Player::getBlendshapeCoefficients()";
return QVector<float>();
}
QVector<glm::quat> Player::getJointRotations() {
computeCurrentFrame();
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) {
if (_currentFrame == _recording->getFrameNumber()) {
return _recording->getFrame(_currentFrame - 1).getJointRotations();
}
return _recording->getFrame(_currentFrame).getJointRotations();
}
qWarning() << "Incorrect use of Player::getJointRotations()";
return QVector<glm::quat>();
}
glm::vec3 Player::getPosition() {
computeCurrentFrame();
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) {
if (_currentFrame == _recording->getFrameNumber()) {
return _recording->getFrame(0).getTranslation() +
_recording->getFrame(_currentFrame - 1).getTranslation();
}
if (_currentFrame == 0) {
return _recording->getFrame(_currentFrame).getTranslation();
}
return _recording->getFrame(0).getTranslation() +
_recording->getFrame(_currentFrame).getTranslation();
}
qWarning() << "Incorrect use of Player::getTranslation()";
return glm::vec3();
}
glm::quat Player::getRotation() {
computeCurrentFrame();
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) {
if (_currentFrame == _recording->getFrameNumber()) {
return _recording->getFrame(0).getRotation() *
_recording->getFrame(_currentFrame - 1).getRotation();
}
if (_currentFrame == 0) {
return _recording->getFrame(_currentFrame).getRotation();
}
return _recording->getFrame(0).getRotation() *
_recording->getFrame(_currentFrame).getRotation();
}
qWarning() << "Incorrect use of Player::getRotation()";
return glm::quat();
}
float Player::getScale() {
computeCurrentFrame();
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) {
if (_currentFrame == _recording->getFrameNumber()) {
return _recording->getFrame(0).getScale() *
_recording->getFrame(_currentFrame - 1).getScale();
}
if (_currentFrame == 0) {
return _recording->getFrame(_currentFrame).getScale();
}
return _recording->getFrame(0).getScale() *
_recording->getFrame(_currentFrame).getScale();
}
qWarning() << "Incorrect use of Player::getScale()";
return 1.0f;
}
glm::quat Player::getHeadRotation() { glm::quat Player::getHeadRotation() {
computeCurrentFrame(); if (computeCurrentFrame()) {
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) { qWarning() << "Incorrect use of Player::getHeadRotation()";
if (_currentFrame == _recording->getFrameNumber()) { return glm::quat();
return _recording->getFrame(0).getHeadRotation() *
_recording->getFrame(_currentFrame - 1).getHeadRotation();
}
if (_currentFrame == 0) {
return _recording->getFrame(_currentFrame).getHeadRotation();
}
return _recording->getFrame(0).getHeadRotation() *
_recording->getFrame(_currentFrame).getHeadRotation();
} }
qWarning() << "Incorrect use of Player::getHeadRotation()";
return glm::quat(); if (_currentFrame == 0) {
return _recording->getFrame(_currentFrame).getHeadRotation();
}
return _recording->getFrame(0).getHeadRotation() *
_recording->getFrame(_currentFrame).getHeadRotation();
} }
float Player::getLeanSideways() { float Player::getLeanSideways() {
computeCurrentFrame(); if (computeCurrentFrame()) {
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) { qWarning() << "Incorrect use of Player::getLeanSideways()";
if (_currentFrame == _recording->getFrameNumber()) { return 0.0f;
return _recording->getFrame(_currentFrame - 1).getLeanSideways();
}
return _recording->getFrame(_currentFrame).getLeanSideways();
} }
qWarning() << "Incorrect use of Player::getLeanSideways()";
return 0.0f; return _recording->getFrame(_currentFrame).getLeanSideways();
} }
float Player::getLeanForward() { float Player::getLeanForward() {
computeCurrentFrame(); if (computeCurrentFrame()) {
if (_currentFrame >= 0 && _currentFrame <= _recording->getFrameNumber()) { qWarning() << "Incorrect use of Player::getLeanForward()";
if (_currentFrame == _recording->getFrameNumber()) { return 0.0f;
return _recording->getFrame(_currentFrame - 1).getLeanForward();
}
return _recording->getFrame(_currentFrame).getLeanForward();
} }
qWarning() << "Incorrect use of Player::getLeanForward()";
return 0.0f; return _recording->getFrame(_currentFrame).getLeanForward();
} }
#include <QMetaObject>
void Player::startPlaying() { void Player::startPlaying() {
if (_recording && _recording->getFrameNumber() > 0) { if (_recording && _recording->getFrameNumber() > 0) {
qDebug() << "Recorder::startPlaying()"; qDebug() << "Recorder::startPlaying()";
@ -350,7 +258,6 @@ void Player::loadRecording(RecordingPointer recording) {
} }
void Player::play() { void Player::play() {
qDebug() << "Playing " << _timer.elapsed() / 1000.0f;
computeCurrentFrame(); computeCurrentFrame();
if (_currentFrame < 0 || _currentFrame >= _recording->getFrameNumber()) { if (_currentFrame < 0 || _currentFrame >= _recording->getFrameNumber()) {
// If it's the end of the recording, stop playing // If it's the end of the recording, stop playing
@ -378,14 +285,12 @@ void Player::play() {
} }
} }
void Player::computeCurrentFrame() { bool Player::computeCurrentFrame() {
if (!isPlaying()) { if (!isPlaying()) {
qDebug() << "Not Playing";
_currentFrame = -1; _currentFrame = -1;
return; return false;
} }
if (_currentFrame < 0) { if (_currentFrame < 0) {
qDebug() << "Reset to 0";
_currentFrame = 0; _currentFrame = 0;
} }
@ -393,6 +298,8 @@ void Player::computeCurrentFrame() {
_recording->getFrameTimestamp(_currentFrame) < _timer.elapsed()) { _recording->getFrameTimestamp(_currentFrame) < _timer.elapsed()) {
++_currentFrame; ++_currentFrame;
} }
return true;
} }
void writeRecordingToFile(RecordingPointer recording, QString file) { void writeRecordingToFile(RecordingPointer recording, QString file) {

7
interface/src/Recorder.h
View file

@ -138,11 +138,6 @@ public:
qint64 elapsed() const; qint64 elapsed() const;
// Those should only be called if isPlaying() returns true // Those should only be called if isPlaying() returns true
QVector<float> getBlendshapeCoefficients();
QVector<glm::quat> getJointRotations();
glm::vec3 getPosition();
glm::quat getRotation();
float getScale();
glm::quat getHeadRotation(); glm::quat getHeadRotation();
float getLeanSideways(); float getLeanSideways();
float getLeanForward(); float getLeanForward();
@ -156,7 +151,7 @@ public slots:
void play(); void play();
private: private:
void computeCurrentFrame(); bool computeCurrentFrame();
QElapsedTimer _timer; QElapsedTimer _timer;
RecordingPointer _recording; RecordingPointer _recording;