Refactor|libgui|ModelDrawable: Calculating animation time

The model animator may use more advanced logic to determine the current time of the animation, so allow overriding the default time.
skyjake · Aug 5, 2014 · 4409d6d · 4409d6d
1 parent db143ac
commit 4409d6d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/doomsday/libgui/include/de/graphics/modeldrawable.h b/doomsday/libgui/include/de/graphics/modeldrawable.h
@@ -124,6 +124,15 @@ class LIBGUI_PUBLIC ModelDrawable : public AssetGroup
          */
         virtual void advanceTime(TimeDelta const &elapsed);
 
+        /**
+         * Returns the time to be used when drawing the model.
+         *
+         * @param index  Animation index.
+         *
+         * @return Time in the model's animation sequence.
+         */
+        virtual ddouble currentTime(int index) const;
+
     private:
         DENG2_PRIVATE(d)
     };

diff --git a/doomsday/libgui/src/graphics/modeldrawable.cpp b/doomsday/libgui/src/graphics/modeldrawable.cpp
@@ -776,7 +776,7 @@ DENG2_PIMPL(ModelDrawable)
             DENG2_ASSERT(duint(anim.animId) < scene->mNumAnimations);
             DENG2_ASSERT(nodeNameToPtr.contains(anim.node));
 
-            accumulateAnimationTransforms(anim.time,
+            accumulateAnimationTransforms(animation->currentTime(i),
                                           *scene->mAnimations[anim.animId],
                                           *nodeNameToPtr[anim.node]);
         }
@@ -1057,4 +1057,9 @@ void ModelDrawable::Animator::advanceTime(TimeDelta const &)
     // overridden
 }
 
+ddouble ModelDrawable::Animator::currentTime(int index) const
+{
+    return at(index).time;
+}
+
 } // namespace de