diff --git a/app/node/CMakeLists.txt b/app/node/CMakeLists.txt
index eb4d9bcb7..1571fe79d 100644
--- a/app/node/CMakeLists.txt
+++ b/app/node/CMakeLists.txt
@@ -16,6 +16,8 @@
set(OLIVE_SOURCES
${OLIVE_SOURCES}
+ node/edge.h
+ node/edge.cpp
node/node.h
node/node.cpp
node/graph.h
diff --git a/app/node/edge.cpp b/app/node/edge.cpp
new file mode 100644
index 000000000..aa9e25ca2
--- /dev/null
+++ b/app/node/edge.cpp
@@ -0,0 +1,37 @@
+/***
+
+ Olive - Non-Linear Video Editor
+ Copyright (C) 2019 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 .
+
+***/
+
+#include "edge.h"
+
+NodeEdge::NodeEdge(NodeOutput *output, NodeInput *input) :
+ output_(output),
+ input_(input)
+{
+}
+
+NodeOutput *NodeEdge::output()
+{
+ return output_;
+}
+
+NodeInput *NodeEdge::input()
+{
+ return input_;
+}
diff --git a/app/node/edge.h b/app/node/edge.h
new file mode 100644
index 000000000..a6b747135
--- /dev/null
+++ b/app/node/edge.h
@@ -0,0 +1,44 @@
+/***
+
+ Olive - Non-Linear Video Editor
+ Copyright (C) 2019 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 .
+
+***/
+
+#ifndef EDGE_H
+#define EDGE_H
+
+#include
+
+class NodeOutput;
+class NodeInput;
+
+class NodeEdge
+{
+public:
+ NodeEdge(NodeOutput* output, NodeInput* input);
+
+ NodeOutput* output();
+ NodeInput* input();
+
+private:
+ NodeOutput* output_;
+ NodeInput* input_;
+};
+
+using NodeEdgePtr = std::shared_ptr;
+
+#endif // EDGE_H
diff --git a/app/node/input.cpp b/app/node/input.cpp
index 570e2c44d..44b275d0f 100644
--- a/app/node/input.cpp
+++ b/app/node/input.cpp
@@ -21,7 +21,8 @@
#include "input.h"
NodeInput::NodeInput(Node* parent) :
- NodeParam(parent)
+ NodeParam(parent),
+ can_accept_multiple_inputs_(false)
{
}
@@ -39,3 +40,13 @@ bool NodeInput::can_accept_type(const NodeParam::DataType &data_type)
{
return AreDataTypesCompatible(data_type, inputs_);
}
+
+bool NodeInput::can_accept_multiple_inputs()
+{
+ return can_accept_multiple_inputs_;
+}
+
+void NodeInput::set_can_accept_multiple_inputs(bool b)
+{
+ can_accept_multiple_inputs_ = b;
+}
diff --git a/app/node/input.h b/app/node/input.h
index 73add2a23..be3c6c67a 100644
--- a/app/node/input.h
+++ b/app/node/input.h
@@ -34,8 +34,13 @@ public:
bool can_accept_type(const DataType& data_type);
+ bool can_accept_multiple_inputs();
+ void set_can_accept_multiple_inputs(bool b);
+
private:
QList inputs_;
+
+ bool can_accept_multiple_inputs_;
};
#endif // NODEINPUT_H
diff --git a/app/node/node.h b/app/node/node.h
index b1276a406..2c8ca143b 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -23,6 +23,8 @@
#include
+#include "node/param.h"
+
class Node : public QObject
{
public:
diff --git a/app/node/param.cpp b/app/node/param.cpp
index 0c871e291..eb6c196e2 100644
--- a/app/node/param.cpp
+++ b/app/node/param.cpp
@@ -20,7 +20,9 @@
#include "param.h"
-#include "node.h"
+#include "node/node.h"
+#include "node/input.h"
+#include "node/output.h"
NodeParam::NodeParam(Node *parent) :
QObject(parent)
@@ -28,6 +30,16 @@ NodeParam::NodeParam(Node *parent) :
}
+const QString &NodeParam::name()
+{
+ return name_;
+}
+
+void NodeParam::set_name(const QString &name)
+{
+ name_ = name;
+}
+
bool NodeParam::AreDataTypesCompatible(const NodeParam::DataType &output_type, const NodeParam::DataType &input_type)
{
if (input_type == output_type) {
@@ -60,3 +72,43 @@ bool NodeParam::AreDataTypesCompatible(const DataType &output_type, const QList<
return false;
}
+
+void NodeParam::ConnectEdge(NodeOutput *output, NodeInput *input)
+{
+ // If the input can only accept one input (the default) and has one already, disconnect it
+ if (!input->edges_.isEmpty() && !input->can_accept_multiple_inputs()) {
+ DisconnectEdge(input->edges_.first());
+ }
+
+ NodeEdgePtr edge = std::make_shared(output, input);
+
+ output->edges_.append(edge);
+ input->edges_.append(edge);
+}
+
+void NodeParam::DisconnectEdge(NodeEdgePtr edge)
+{
+ NodeOutput* output = edge->output();
+ NodeInput* input = edge->input();
+
+ output->edges_.removeAll(edge);
+ input->edges_.removeAll(edge);
+}
+
+QString NodeParam::GetDefaultDataTypeName(const DataType& type)
+{
+ switch (type) {
+ case kNone: return tr("None");
+ case kInt: return tr("Integer");
+ case kFloat: return tr("Float");
+ case kColor: return tr("Color");
+ case kString: return tr("String");
+ case kBoolean: return tr("Boolean");
+ case kFont: return tr("Font");
+ case kFile: return tr("File");
+ case kTexture: return tr("Texture");
+ case kMatrix: return tr("Matrix");
+ case kBlock: return tr("Block");
+ case kAny: return tr("Any");
+ }
+}
diff --git a/app/node/param.h b/app/node/param.h
index 9899d08c2..47659baa6 100644
--- a/app/node/param.h
+++ b/app/node/param.h
@@ -23,6 +23,8 @@
#include
+#include "node/edge.h"
+
class Node;
class NodeParam : public QObject
@@ -53,11 +55,21 @@ public:
virtual Type type() = 0;
+ const QString& name();
+ void set_name(const QString& name);
+
static bool AreDataTypesCompatible(const DataType& output_type, const DataType& input_type);
static bool AreDataTypesCompatible(const DataType& output_type, const QList& input_types);
-private:
+ static void ConnectEdge(NodeOutput *output, NodeInput *input);
+ static void DisconnectEdge(NodeEdgePtr edge);
+ static QString GetDefaultDataTypeName(const DataType &type);
+
+private:
+ QVector edges_;
+
+ QString name_;
};
#endif // NODEPARAM_H