Add data parameter to task functions

Author: bluekyu

render_pipeline/rppanda/showbase/direct_object.hpp

@@ -90,7 +90,8 @@ class RENDER_PIPELINE_DECL DirectObject : public TypedReferenceCount
      * @see TaskManager::add
      */
     FunctionalTask* add_task(const FunctionalTask::TaskFunc& func, const std::string& name = {},
-        boost::optional<int> sort = boost::none, boost::optional<int> priority = boost::none,
+        boost::optional<int> sort = boost::none, const FunctionalTask::UserDataType& data = {},
+        boost::optional<int> priority = boost::none,
         const boost::optional<std::string>& task_chain = boost::none,
         const FunctionalTask::DeathFunc& upon_death = nullptr);
 
@@ -107,7 +108,8 @@ class RENDER_PIPELINE_DECL DirectObject : public TypedReferenceCount
      */
     FunctionalTask* do_method_later(float delay_time,
         const FunctionalTask::TaskFunc& func, const std::string& name,
-        boost::optional<int> sort = boost::none, boost::optional<int> priority = boost::none,
+        boost::optional<int> sort = boost::none, const FunctionalTask::UserDataType& data = {},
+        boost::optional<int> priority = boost::none,
         const boost::optional<std::string>& task_chain = boost::none,
         const FunctionalTask::DeathFunc& upon_death = nullptr);
 

render_pipeline/rppanda/task/task_manager.hpp

@@ -138,7 +138,8 @@ class RENDER_PIPELINE_DECL TaskManager : public TypedObject
      */
     FunctionalTask* do_method_later(float delay_time,
         const FunctionalTask::TaskFunc& func, const std::string& name,
-        boost::optional<int> sort = boost::none, boost::optional<int> priority = boost::none,
+        boost::optional<int> sort = boost::none, const FunctionalTask::UserDataType& data = {},
+        boost::optional<int> priority = boost::none,
         const boost::optional<std::string>& task_chain = boost::none,
         const FunctionalTask::DeathFunc& upon_death=nullptr);
 
@@ -181,7 +182,8 @@ class RENDER_PIPELINE_DECL TaskManager : public TypedObject
      * @return  pointer of a new task object
      */
     FunctionalTask* add(const FunctionalTask::TaskFunc& func, const std::string& name,
-        boost::optional<int> sort = boost::none, boost::optional<int> priority = boost::none,
+        boost::optional<int> sort = boost::none, const FunctionalTask::UserDataType& data = {},
+        boost::optional<int> priority = boost::none,
         const boost::optional<std::string>& task_chain = boost::none,
         const FunctionalTask::DeathFunc& upon_death = nullptr);
 

src/rpcore/gui/draggable_window.cpp

@@ -113,7 +113,7 @@ void DraggableWindow::start_drag()
 
     Globals::base->get_task_mgr()->add(
         [this](rppanda::FunctionalTask* task) { return on_tick(task); },
-        "UIWindowDrag", boost::none, boost::none, boost::none,
+        "UIWindowDrag", boost::none, {}, boost::none, boost::none,
         [this](rppanda::FunctionalTask*, bool) { stop_drag(); });
 
     drag_offset_ = pos_ - get_mouse_pos();

src/rppanda/showbase/direct_object.cpp

@@ -104,11 +104,13 @@ AsyncTask* DirectObject::add_task(AsyncTask* task, const std::string& name,
 }
 
 FunctionalTask* DirectObject::add_task(const FunctionalTask::TaskFunc& func, const std::string& name,
-    boost::optional<int> sort, boost::optional<int> priority,
+    boost::optional<int> sort, const FunctionalTask::UserDataType& data,
+    boost::optional<int> priority,
     const boost::optional<std::string>& task_chain,
     const FunctionalTask::DeathFunc& upon_death)
 {
-    auto new_task = TaskManager::get_global_instance()->add(func, name, sort, priority, task_chain, upon_death);
+    auto new_task = TaskManager::get_global_instance()->add(
+        func, name, sort, data, priority, task_chain, upon_death);
     do_add_task(new_task);
     return new_task;
 }
@@ -118,18 +120,21 @@ AsyncTask* DirectObject::do_method_later(float delay_time, AsyncTask* task,
     boost::optional<int> sort, boost::optional<int> priority,
     const boost::optional<std::string>& task_chain)
 {
-    auto new_task = TaskManager::get_global_instance()->do_method_later(delay_time, task, name, sort, priority, task_chain);
+    auto new_task = TaskManager::get_global_instance()->do_method_later(
+        delay_time, task, name, sort, priority, task_chain);
     do_add_task(new_task);
     return new_task;
 }
 
 FunctionalTask* DirectObject::do_method_later(float delay_time,
     const FunctionalTask::TaskFunc& func, const std::string& name,
-    boost::optional<int> sort, boost::optional<int> priority,
+    boost::optional<int> sort, const FunctionalTask::UserDataType& data,
+    boost::optional<int> priority,
     const boost::optional<std::string>& task_chain,
     const FunctionalTask::DeathFunc& upon_death)
 {
-    auto new_task = TaskManager::get_global_instance()->do_method_later(delay_time, func, name, sort, priority, task_chain, upon_death);
+    auto new_task = TaskManager::get_global_instance()->do_method_later(
+        delay_time, func, name, sort, data, priority, task_chain, upon_death);
     do_add_task(new_task);
     return new_task;
 }

src/rppanda/task/task_manager.cpp

@@ -136,11 +136,12 @@ AsyncTask* TaskManager::do_method_later(float delay_time, AsyncTask* task,
 
 FunctionalTask* TaskManager::do_method_later(float delay_time,
     const FunctionalTask::TaskFunc& func, const std::string& name,
-    boost::optional<int> sort, boost::optional<int> priority,
+    boost::optional<int> sort, const FunctionalTask::UserDataType& data,
+    boost::optional<int> priority,
     const boost::optional<std::string>& task_chain,
     const FunctionalTask::DeathFunc& upon_death)
 {
-    PT(FunctionalTask) task = new FunctionalTask(func, name);
+    PT(FunctionalTask) task = new FunctionalTask(func, data, name);
     if (upon_death)
         task->set_upon_death(upon_death);
 
@@ -163,11 +164,12 @@ AsyncTask* TaskManager::add(AsyncTask* task, const std::string& name,
 }
 
 FunctionalTask* TaskManager::add(const FunctionalTask::TaskFunc& func, const std::string& name,
-    boost::optional<int> sort, boost::optional<int> priority,
+    boost::optional<int> sort, const FunctionalTask::UserDataType& data,
+    boost::optional<int> priority,
     const boost::optional<std::string>& task_chain,
     const FunctionalTask::DeathFunc& upon_death)
 {
-    PT(FunctionalTask) task = new FunctionalTask(func, name);
+    PT(FunctionalTask) task = new FunctionalTask(func, data, name);
     if (upon_death)
         task->set_upon_death(upon_death);