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

Merge pull request #12202 from amantley/urlbug

Browse source 
added a property check in renderableModelEntity for the animation url…
This commit is contained in:
John Conklin II 2018-01-19 12:52:43 -08:00 committed by GitHub
commit c366ed42ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1394,8 +1394,14 @@ void ModelEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
// That is where _currentFrame and _lastAnimated were updated. // That is where _currentFrame and _lastAnimated were updated.
if (_animating) { if (_animating) {
DETAILED_PROFILE_RANGE(simulation_physics, "Animate"); DETAILED_PROFILE_RANGE(simulation_physics, "Animate");
if (!jointsMapped()) { if (!jointsMapped()) {
mapJoints(entity, model->getJointNames()); mapJoints(entity, model->getJointNames());
//else the joint have been mapped before but we have a new animation to load
} else if (_animation && (_animation->getURL().toString() != entity->getAnimationURL())) {
_animation = DependencyManager::get<AnimationCache>()->getAnimation(entity->getAnimationURL());
_jointMappingCompleted = false;
mapJoints(entity, model->getJointNames());
} }
if (!(entity->getAnimationFirstFrame() < 0) && !(entity->getAnimationFirstFrame() > entity->getAnimationLastFrame())) { if (!(entity->getAnimationFirstFrame() < 0) && !(entity->getAnimationFirstFrame() > entity->getAnimationLastFrame())) {
animate(entity); animate(entity);