Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 04:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

When devices become inactive (including when Faceshift reports loss of

Browse source 
tracking), smoothly restore neutral head rotation/lean.
This commit is contained in:
Andrzej Kapolka 2013-09-10 11:14:36 -07:00
parent 13a19e2986
commit c56778c3bf
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/avatar/MyAvatar.cpp
View file

@ -347,14 +347,19 @@ void MyAvatar::updateFromGyrosAndOrWebcam(bool gyroLook,
} else if (webcam->isActive()) { } else if (webcam->isActive()) {
estimatedRotation = webcam->getEstimatedRotation(); estimatedRotation = webcam->getEstimatedRotation();
} else if (_leadingAvatar) {
_head.getFace().clearFrame();
return;
} else { } else {
_head.setMousePitch(pitchFromTouch); if (!_leadingAvatar) {
_head.setPitch(pitchFromTouch); _head.setMousePitch(pitchFromTouch);
_head.setPitch(pitchFromTouch);
}
_head.getFace().clearFrame(); _head.getFace().clearFrame();
// restore rotation, lean to neutral positions
const float RESTORE_RATE = 0.5f;
_head.setYaw(glm::mix(_head.getYaw(), 0.0f, RESTORE_RATE));
_head.setRoll(glm::mix(_head.getRoll(), 0.0f, RESTORE_RATE));
_head.setLeanSideways(glm::mix(_head.getLeanSideways(), 0.0f, RESTORE_RATE));
_head.setLeanForward(glm::mix(_head.getLeanForward(), 0.0f, RESTORE_RATE));
return; return;
} }
_head.setMousePitch(pitchFromTouch); _head.setMousePitch(pitchFromTouch);

3
interface/src/devices/Faceshift.cpp
View file

@ -73,6 +73,7 @@ void Faceshift::connectSocket() {
const quint16 FACESHIFT_PORT = 33433; const quint16 FACESHIFT_PORT = 33433;
_socket.connectToHost("localhost", FACESHIFT_PORT); _socket.connectToHost("localhost", FACESHIFT_PORT);
_tracking = false;
} }
} }
@ -102,7 +103,7 @@ void Faceshift::readFromSocket() {
switch (msg->id()) { switch (msg->id()) {
case fsMsg::MSG_OUT_TRACKING_STATE: { case fsMsg::MSG_OUT_TRACKING_STATE: {
const fsTrackingData& data = static_cast<fsMsgTrackingState*>(msg.get())->tracking_data(); const fsTrackingData& data = static_cast<fsMsgTrackingState*>(msg.get())->tracking_data();
if (data.m_trackingSuccessful) { if ((_tracking = data.m_trackingSuccessful)) {
_headRotation = glm::quat(data.m_headRotation.w, -data.m_headRotation.x, _headRotation = glm::quat(data.m_headRotation.w, -data.m_headRotation.x,
data.m_headRotation.y, -data.m_headRotation.z); data.m_headRotation.y, -data.m_headRotation.z);
const float TRANSLATION_SCALE = 0.02f; const float TRANSLATION_SCALE = 0.02f;

3
interface/src/devices/Faceshift.h
View file

@ -24,7 +24,7 @@ public:
Faceshift(); Faceshift();
bool isActive() const { return _socket.state() == QAbstractSocket::ConnectedState; } bool isActive() const { return _socket.state() == QAbstractSocket::ConnectedState && _tracking; }
const glm::quat& getHeadRotation() const { return _headRotation; } const glm::quat& getHeadRotation() const { return _headRotation; }
const glm::vec3& getHeadTranslation() const { return _headTranslation; } const glm::vec3& getHeadTranslation() const { return _headTranslation; }
@ -66,6 +66,7 @@ private:
QTcpSocket _socket; QTcpSocket _socket;
fs::fsBinaryStream _stream; fs::fsBinaryStream _stream;
bool _enabled; bool _enabled;
bool _tracking;
glm::quat _headRotation; glm::quat _headRotation;
glm::vec3 _headTranslation; glm::vec3 _headTranslation;