oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use strings to connect nodes

Browse Source 
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:
itsmattkc
2021-02-09 15:48:37 +11:00
parent d1a3e22eaa
commit 81c1922911
138 changed files with 4487 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/audio/pan/pan.cpp
+18 -13
View File
@@ -24,14 +24,17 @@
namespace olive {
const QString PanNode::kSamplesInput = QStringLiteral("samples_in");
const QString PanNode::kPanningInput = QStringLiteral("panning_in");
PanNode::PanNode()
{
samples_input_ = new NodeInput(this, QStringLiteral("samples_in"), NodeValue::kSamples);
AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable));
panning_input_ = new NodeInput(this, QStringLiteral("panning_in"), NodeValue::kFloat, 0.0);
panning_input_->setProperty("min", -1.0);
panning_input_->setProperty("max", 1.0);
panning_input_->setProperty("view", FloatSlider::kPercentage);
AddInput(kPanningInput, NodeValue::kFloat, 0.0);
SetInputProperty(kPanningInput, QStringLiteral("min"), -1.0);
SetInputProperty(kPanningInput, QStringLiteral("max"), 1.0);
SetInputProperty(kPanningInput, QStringLiteral("view"), FloatSlider::kPercentage);
}
Node *PanNode::copy() const
@@ -59,18 +62,20 @@ QString PanNode::Description() const
return tr("Adjust the stereo panning of an audio source.");
}
NodeValueTable PanNode::Value(NodeValueDatabase &value) const
NodeValueTable PanNode::Value(const QString &output, NodeValueDatabase &value) const
{
Q_UNUSED(output)
// Create a sample job
SampleJob job(samples_input_, value);
job.InsertValue(panning_input_, value);
SampleJob job(kSamplesInput, value);
job.InsertValue(this, kPanningInput, value);
// Push it to our table
NodeValueTable table = value.Merge();
if (job.HasSamples()) {
float pan_volume = job.GetValue(panning_input_).data().toFloat();
if (panning_input_->IsStatic()) {
float pan_volume = job.GetValue(kPanningInput).data().toFloat();
if (IsInputStatic(kPanningInput)) {
if (!qIsNull(pan_volume) && job.samples()->audio_params().channel_count() == 2) {
if (pan_volume > 0) {
job.samples()->transform_volume_for_channel(0, 1.0f - pan_volume);
@@ -95,7 +100,7 @@ void PanNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr in
return;
}
float pan_val = values[panning_input_].Get(NodeValue::kFloat).toFloat();
float pan_val = values[kPanningInput].Get(NodeValue::kFloat).toFloat();
for (int i=0;i<input->audio_params().channel_count();i++) {
output->data()[i][index] = input->data()[i][index];
@@ -110,8 +115,8 @@ void PanNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr in
void PanNode::Retranslate()
{
samples_input_->set_name(tr("Samples"));
panning_input_->set_name(tr("Pan"));
SetInputName(kSamplesInput, tr("Samples"));
SetInputName(kPanningInput, tr("Pan"));
}
}
app/node/audio/pan/pan.h
+4 -1
View File
@@ -38,12 +38,15 @@ public:
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual NodeValueTable Value(NodeValueDatabase &value) const override;
virtual NodeValueTable Value(const QString& output, NodeValueDatabase &value) const override;
virtual void ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
virtual void Retranslate() override;
static const QString kSamplesInput;
static const QString kPanningInput;
private:
NodeInput* samples_input_;
NodeInput* panning_input_;