Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Browse source
This commit is contained in:
Andrzej Kapolka 2014-04-04 16:41:43 -07:00
commit 404b804b2f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ FaceModel::FaceModel(Head* owningHead) :
{ {
} }
void FaceModel::simulate(float deltaTime) { void FaceModel::simulate(float deltaTime, bool fullUpdate) {
updateGeometry(); updateGeometry();
Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar); Avatar* owningAvatar = static_cast<Avatar*>(_owningHead->_owningAvatar);
glm::vec3 neckPosition; glm::vec3 neckPosition;

2
interface/src/avatar/FaceModel.h
View file

@ -21,7 +21,7 @@ public:
FaceModel(Head* owningHead); FaceModel(Head* owningHead);
void simulate(float deltaTime); virtual void simulate(float deltaTime, bool fullUpdate = true);
protected: protected: