From 8cd59ab5de876934c0c3de0cb36acdd4de6a1dad Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 29 Jul 2014 16:08:15 -0700 Subject: [PATCH] Forward declaration of RotationExtractor --- interface/src/renderer/JointState.cpp | 43 ++++++++++++++------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/interface/src/renderer/JointState.cpp b/interface/src/renderer/JointState.cpp index b74cb83ad7..abaa9df7c8 100644 --- a/interface/src/renderer/JointState.cpp +++ b/interface/src/renderer/JointState.cpp @@ -18,6 +18,28 @@ #include "JointState.h" + +class RotationExtractor : public QRunnable { +public: + + RotationExtractor(glm::mat4 transform, glm::quat& rotation); + + virtual void run(); + +private: + glm::mat4 _transform; + glm::quat _rotation; +}; + +RotationExtractor::RotationExtractor(glm::mat4 transform, glm::quat& rotation) { + _transform = transform; + _rotation = rotation; +} + +void RotationExtractor::run() { + _rotation = extractRotation(_transform); +} + JointState::JointState() : _animationPriority(0.0f), _transformChanged(true), @@ -258,25 +280,4 @@ void JointState::slaveVisibleTransform() { _visibleTransform = _transform; _visibleRotation = _rotation; _visibleRotationInConstrainedFrame = _rotationInConstrainedFrame; -} - -class RotationExtractor : public QRunnable { -public: - - RotationExtractor(glm::mat4 transform, glm::quat& rotation); - - virtual void run(); - -private: - glm::mat4 _transform; - glm::quat _rotation; -}; - -RotationExtractor::RotationExtractor(glm::mat4 transform, glm::quat& rotation) { - _transform = transform; - _rotation = rotation; -} - -void RotationExtractor::run() { - _rotation = extractRotation(_transform); } \ No newline at end of file