Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:13:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add locationChanged to model entities

Browse source
This commit is contained in:
Seth Alves 2015-12-16 15:21:20 -08:00
parent 8bfbb69316
commit 489d4099a7
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -199,6 +199,8 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
motionState->dirtyInternalKinematicChanges();
ownerEntity->setPosition(_positionalTarget);
_previousPositionalTarget = _positionalTarget;
_previousRotationalTarget = _rotationalTarget;
_previousSet = true;

8
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -625,3 +625,11 @@ glm::vec3 RenderableModelEntityItem::getAbsoluteJointTranslationInObjectFrame(in
}
return glm::vec3(0.0f);
}
void RenderableModelEntityItem::locationChanged() {
EntityItem::locationChanged();
if (_model && _model->isActive()) {
_model->setRotation(getRotation());
_model->setTranslation(getPosition());
}
}

1
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -73,6 +73,7 @@ public:
virtual glm::vec3 getAbsoluteJointTranslationInObjectFrame(int index) const override;
virtual void loader() override;
virtual void locationChanged() override;
private:
void remapTextures();