use strings to connect nodes
This makes the node system somewhat more high-level with the intent of making working with them far more flexible and stable. By making the architecture more abstracted, it becomes far less rigid which should allow us to do even more with it and make it much less crash prone.
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
render/job/acceleratedjob.cpp
|
||||
render/job/acceleratedjob.h
|
||||
render/job/generatejob.h
|
||||
render/job/samplejob.h
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2020 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#include "acceleratedjob.h"
|
||||
|
||||
#include "node/node.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
void AcceleratedJob::InsertValue(const Node* node, const QString& input, NodeValueDatabase& value)
|
||||
{
|
||||
InsertValue(input, value[input].TakeWithMeta(node->GetInputDataType(input)));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,8 +21,8 @@
|
||||
#ifndef ACCELERATEDJOB_H
|
||||
#define ACCELERATEDJOB_H
|
||||
|
||||
#include "node/input.h"
|
||||
#include "node/value.h"
|
||||
#include "node/param.h"
|
||||
#include "node/valuedatabase.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
@@ -30,31 +30,18 @@ class AcceleratedJob {
|
||||
public:
|
||||
AcceleratedJob() = default;
|
||||
|
||||
NodeValue GetValue(NodeInput* input) const
|
||||
{
|
||||
return value_map_.value(input->id());
|
||||
}
|
||||
|
||||
NodeValue GetValue(const QString& input) const
|
||||
{
|
||||
return value_map_.value(input);
|
||||
}
|
||||
|
||||
void InsertValue(NodeInput* input, NodeValueDatabase& value)
|
||||
{
|
||||
InsertValue(input->id(), value[input].TakeWithMeta(input->GetDataType()));
|
||||
}
|
||||
void InsertValue(const Node* node, const QString& input, NodeValueDatabase& value);
|
||||
|
||||
void InsertValue(const QString& input, const NodeValue& value)
|
||||
{
|
||||
value_map_.insert(input, value);
|
||||
}
|
||||
|
||||
void InsertValue(NodeInput* input, const NodeValue& value)
|
||||
{
|
||||
value_map_.insert(input->id(), value);
|
||||
}
|
||||
|
||||
const NodeValueMap &GetValues() const
|
||||
{
|
||||
return value_map_;
|
||||
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
samples_ = value.data().value<SampleBufferPtr>();
|
||||
}
|
||||
|
||||
SampleJob(NodeInput* from, NodeValueDatabase& db)
|
||||
SampleJob(const QString& from, NodeValueDatabase& db)
|
||||
{
|
||||
samples_ = db[from].Take(NodeValue::kSamples).value<SampleBufferPtr>();
|
||||
}
|
||||
|
||||
@@ -46,9 +46,9 @@ public:
|
||||
shader_id_ = id;
|
||||
}
|
||||
|
||||
void SetIterations(int iterations, NodeInput* iterative_input)
|
||||
void SetIterations(int iterations, const NodeInput& iterative_input)
|
||||
{
|
||||
SetIterations(iterations, iterative_input->id());
|
||||
SetIterations(iterations, iterative_input.input());
|
||||
}
|
||||
|
||||
void SetIterations(int iterations, const QString& iterative_input)
|
||||
@@ -72,9 +72,9 @@ public:
|
||||
return interpolation_.value(id, Texture::kDefaultInterpolation);
|
||||
}
|
||||
|
||||
void SetInterpolation(NodeInput* input, Texture::Interpolation interp)
|
||||
void SetInterpolation(const NodeInput& input, Texture::Interpolation interp)
|
||||
{
|
||||
interpolation_.insert(input->id(), interp);
|
||||
interpolation_.insert(input.input(), interp);
|
||||
}
|
||||
|
||||
void SetInterpolation(const QString& id, Texture::Interpolation interp)
|
||||
|
||||
Reference in New Issue
Block a user