From 86a9d5719b0f48ba71f8c1c0b63918d1a570954e Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 30 Dec 2014 15:12:23 -0800 Subject: [PATCH] fix one more case of animaiton stutter --- libraries/entities/src/ModelEntityItem.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 0989068f2a..4cdec0f29a 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -18,7 +18,6 @@ #include "EntityTreeElement.h" #include "ModelEntityItem.h" - const QString ModelEntityItem::DEFAULT_MODEL_URL = QString(""); const QString ModelEntityItem::DEFAULT_ANIMATION_URL = QString(""); const float ModelEntityItem::DEFAULT_ANIMATION_FRAME_INDEX = 0.0f; @@ -33,7 +32,7 @@ EntityItem* ModelEntityItem::factory(const EntityItemID& entityID, const EntityI ModelEntityItem::ModelEntityItem(const EntityItemID& entityItemID, const EntityItemProperties& properties) : EntityItem(entityItemID, properties) { - _type = EntityTypes::Model; + _type = EntityTypes::Model; setProperties(properties); _lastAnimated = usecTimestampNow(); _jointMappingCompleted = false; @@ -343,9 +342,6 @@ QVector ModelEntityItem::getAnimationFrame() { Animation* myAnimation = getAnimation(_animationURL); QVector frames = myAnimation->getFrames(); int frameCount = frames.size(); - if (_animationLoop.getMaxFrameIndexHint() != frameCount) { - _animationLoop.setMaxFrameIndexHint(frameCount); - } if (frameCount > 0) { int animationFrameIndex = (int)(glm::floor(getAnimationFrameIndex())) % frameCount; if (animationFrameIndex < 0 || animationFrameIndex > frameCount) {