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

Fix for head appearing at wrong position for a single frame.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-02-13 16:49:42 -08:00
parent 5f38c328d5
commit b08d452749
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/FaceModel.cpp
View file

@ -19,6 +19,10 @@ FaceModel::FaceModel(Head* owningHead) :
} }
void FaceModel::simulate(float deltaTime) { void FaceModel::simulate(float deltaTime) {
if (!isActive()) {
Model::simulate(deltaTime);
return;
}
Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar); Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar);
glm::vec3 neckPosition; glm::vec3 neckPosition;
if (!owningAvatar->getSkeletonModel().getNeckPosition(neckPosition)) { if (!owningAvatar->getSkeletonModel().getNeckPosition(neckPosition)) {

4
interface/src/avatar/SkeletonModel.cpp
View file

@ -20,6 +20,10 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar) :
} }
void SkeletonModel::simulate(float deltaTime) { void SkeletonModel::simulate(float deltaTime) {
if (!isActive()) {
Model::simulate(deltaTime);
return;
}
setTranslation(_owningAvatar->getPosition()); setTranslation(_owningAvatar->getPosition());
setRotation(_owningAvatar->getOrientation() * glm::angleAxis(180.0f, 0.0f, 1.0f, 0.0f)); setRotation(_owningAvatar->getOrientation() * glm::angleAxis(180.0f, 0.0f, 1.0f, 0.0f));
const float MODEL_SCALE = 0.0006f; const float MODEL_SCALE = 0.0006f;