Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7360 from zzmp/feat/emplace-render-jobs

Browse source 
Emplace render engine jobs
This commit is contained in:
Brad Hefta-Gaub 2016-03-14 18:57:30 -07:00
commit 4018242045
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/render/src/render/Task.h
View file

@ -240,7 +240,9 @@ public:
const Varying getInput() const { return _input; } const Varying getInput() const { return _input; }
const Varying getOutput() const { return _output; } const Varying getOutput() const { return _output; }
Model(const Varying& input, Data data = Data()) : Concept(std::make_shared<C>()), _data(data), _input(input), _output(Output()) { template <class... A>
Model(const Varying& input, A&&... args) :
Concept(std::make_shared<C>()), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) {
applyConfiguration(); applyConfiguration();
} }
@ -308,7 +310,10 @@ public:
const Varying getInput() const { return _input; } const Varying getInput() const { return _input; }
const Varying getOutput() const { return _output; } const Varying getOutput() const { return _output; }
Model(const Varying& input, Data data = Data()) : Concept(data._config), _data(data), _input(input), _output(Output()) { template <class... A>
Model(const Varying& input, A&&... args) :
Concept(nullptr), _data(Data(std::forward<A>(args)...)), _input(input), _output(Output()) {
_config = _data._config;
std::static_pointer_cast<Config>(_config)->init(&_data); std::static_pointer_cast<Config>(_config)->init(&_data);
applyConfiguration(); applyConfiguration();
} }
@ -337,9 +342,7 @@ public:
// Create a new job in the container's queue; returns the job's output // Create a new job in the container's queue; returns the job's output
template <class T, class... A> const Varying addJob(std::string name, const Varying& input, A&&... args) { template <class T, class... A> const Varying addJob(std::string name, const Varying& input, A&&... args) {
_jobs.emplace_back(name, std::make_shared<typename T::JobModel>( _jobs.emplace_back(name, std::make_shared<typename T::JobModel>(input, std::forward<A>(args)...));
input,
typename T::JobModel::Data(std::forward<A>(args)...)));
QConfigPointer config = _jobs.back().getConfiguration(); QConfigPointer config = _jobs.back().getConfiguration();
config->setParent(_config.get()); config->setParent(_config.get());
config->setObjectName(name.c_str()); config->setObjectName(name.c_str());