Added callbacks, which will be called in animation group on end. Fixed …

…#11.
mamontov-cpp · Jun 28, 2015 · 672fad5 · 672fad5
1 parent 35e8130
commit 672fad5
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 0 deletions.
diff --git a/include/animations/animationsgroup.h b/include/animations/animationsgroup.h
@@ -119,6 +119,61 @@ public sad::TemporarilyImmutableContainer<sad::animations::Instance>
 	/*! Called, when process is removed from pipeline
 	 */
 	virtual void removedFromPipeline();
+    /*! Adds new callback in animation instance, which should be called,
+        when finished c callback
+        \param[in] c
+     */
+    void addCallbackOnEnd(sad::animations::Callback* c);
+    /*! Adds a callback, which should be called on end
+        \param[in] f function
+     */
+    template<typename _Fun>
+    void end(_Fun f)
+    {
+        addCallbackOnEnd(new sad::animations::FunctionCall<_Fun>(f));
+    }
+    /*! Adds a callback, which should be called on end
+        \param[in] o object
+        \param[in] m method
+     */
+    template<typename _Object, typename _Method>
+    void end(_Object* o, _Method m)
+    {
+        addCallbackOnEnd(new sad::animations::MethodCall0<_Object, _Method>(o, m));
+    }
+    /*! Adds a callback, which should be called on end
+        \param[in] o object
+        \param[in] m method
+        \param[in] a argument
+     */
+    template<typename _Object, typename _Method, typename _Arg>
+    void end(_Object* o, _Method m, const _Arg& a)
+    {
+        addCallbackOnEnd(new sad::animations::MethodCall1<_Object, _Method, _Arg>(o, m, a));
+    }
+    /*! Adds a callback, which should be called on end
+        \param[in] o object
+        \param[in] m method
+        \param[in] a1 first argument
+        \param[in] a2 second argument
+     */
+    template<typename _Object, typename _Method, typename _Arg1, typename _Arg2>
+    void end(_Object* o, _Method m, const _Arg1& a1,const _Arg2& a2)
+    {
+        addCallbackOnEnd(new sad::animations::MethodCall2<_Object, _Method, _Arg1, _Arg2>(o, m, a1, a2));
+    }
+    /*! Adds a callback, which should be called on end
+        \param[in] o object
+        \param[in] m method
+        \param[in] a1 first argument
+        \param[in] a2 second argument
+        \param[in] a3 third argument
+     */
+    template<typename _Object, typename _Method, typename _Arg1, typename _Arg2, typename _Arg3>
+    void end(_Object* o, _Method m, const _Arg1& a1,const _Arg2& a2, const _Arg3& a3)
+    {
+        addCallbackOnEnd(new sad::animations::MethodCall3<_Object, _Method, _Arg1, _Arg2, _Arg3>(o, m, a1, a2, a3));
+    }
 protected:
 	 /*! Immediately adds an object to container
 		  \param[in] o object

diff --git a/src/animations/animationsgroup.cpp b/src/animations/animationsgroup.cpp
@@ -262,6 +262,7 @@ void sad::animations::Group::process(sad::animations::Animations* animations)
 		}
 	}
 
+    size_t old_size = m_instances.size();
 	for(size_t i = 0; i < m_instances.size(); i++)
 	{
         m_instances[i]->process(animations);
@@ -271,6 +272,14 @@ void sad::animations::Group::process(sad::animations::Animations* animations)
 			--i;
 		}
 	}
+
+    if (old_size != m_instances.size() && m_instances.size() == 0)
+    {
+        for(size_t i = 0; i < m_callbacks_on_end.size(); i++)
+        {
+            m_callbacks_on_end[i]->invoke();
+        }
+    }
 }
 
 void sad::animations::Group::pause()
@@ -310,6 +319,11 @@ void sad::animations::Group::removedFromPipeline()
 	this->delRef();
 }
 
+void  sad::animations::Group::addCallbackOnEnd(sad::animations::Callback* c)
+{
+    m_callbacks_on_end << c;
+}
+
 // =========================== PROTECTED METHODS ===========================
 
 void sad::animations::Group::getInstances(sad::Vector<sad::animations::Instance*> & result)