From 1c4c288727214fa0588d66556a1cdf71755d70b4 Mon Sep 17 00:00:00 2001 From: Luca Rood Date: Fri, 21 Jul 2017 11:53:13 +0200 Subject: Pass EvaluationContext argument everywhere Note that some little parts of code have been dissabled because eval_ctx was not available there. This should be resolved once DerivedMesh is replaced. --- intern/itasc/MovingFrame.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'intern/itasc/MovingFrame.hpp') diff --git a/intern/itasc/MovingFrame.hpp b/intern/itasc/MovingFrame.hpp index d2a956d7312..89519832840 100644 --- a/intern/itasc/MovingFrame.hpp +++ b/intern/itasc/MovingFrame.hpp @@ -11,10 +11,11 @@ #include "UncontrolledObject.hpp" #include +struct EvaluationContext; namespace iTaSC{ -typedef bool (*MovingFrameCallback)(const Timestamp& timestamp, const Frame& _current, Frame& _next, void *param); +typedef bool (*MovingFrameCallback)(struct EvaluationContext *eval_ctx, const Timestamp& timestamp, const Frame& _current, Frame& _next, void *param); class MovingFrame: public UncontrolledObject { public: @@ -24,7 +25,7 @@ public: bool setFrame(const Frame& frame); bool setCallback(MovingFrameCallback _function, void* _param); - virtual void updateCoordinates(const Timestamp& timestamp); + virtual void updateCoordinates(struct EvaluationContext *eval_ctx, const Timestamp& timestamp); virtual void updateKinematics(const Timestamp& timestamp); virtual void pushCache(const Timestamp& timestamp); virtual void initCache(Cache *_cache); -- cgit v1.2.3