From 8f65f036ddadb7a282c1c193cfa1e3ca09e367fd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 15 Sep 2014 19:06:09 -0700 Subject: [PATCH] Remove deprecated getters --- libraries/avatars/src/Recorder.cpp | 31 ------------------------------ libraries/avatars/src/Recorder.h | 6 ------ 2 files changed, 37 deletions(-) diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp index ce4bd3056d..340146fa92 100644 --- a/libraries/avatars/src/Recorder.cpp +++ b/libraries/avatars/src/Recorder.cpp @@ -186,37 +186,6 @@ qint64 Player::elapsed() const { } } -glm::quat Player::getHeadRotation() { - if (!computeCurrentFrame()) { - 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() { - if (!computeCurrentFrame()) { - qWarning() << "Incorrect use of Player::getLeanSideways()"; - return 0.0f; - } - - return _recording->getFrame(_currentFrame).getLeanSideways(); -} - -float Player::getLeanForward() { - if (!computeCurrentFrame()) { - qWarning() << "Incorrect use of Player::getLeanForward()"; - return 0.0f; - } - - return _recording->getFrame(_currentFrame).getLeanForward(); -} - void Player::startPlaying() { if (_recording && _recording->getFrameNumber() > 0) { qDebug() << "Recorder::startPlaying()"; diff --git a/libraries/avatars/src/Recorder.h b/libraries/avatars/src/Recorder.h index a2eb34399b..e1cfd77cba 100644 --- a/libraries/avatars/src/Recorder.h +++ b/libraries/avatars/src/Recorder.h @@ -142,12 +142,6 @@ public: RecordingPointer getRecording() const { return _recording; } - // Those should only be called if isPlaying() returns true - glm::quat getHeadRotation(); - float getLeanSideways(); - float getLeanForward(); - - public slots: void startPlaying(); void stopPlaying();