summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2017-07-18 11:39:13 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-08-02 17:34:44 +0000
commit32281653bf3564afe075fd684365b640082c695f (patch)
tree465096d352d2a04a4438ea462f297e9f21a41a45 /src/gui/util
parent3d5c4ce01ec074a0bb52583e6885f7c27324f786 (diff)
Add the layer concept to QShaderNode and QShaderGraph::Edge
This will be used in further commits Change-Id: I49977f1ea482b97dc0a159f69a0d2eda3865ec44 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qshadergraph_p.h1
-rw-r--r--src/gui/util/qshadernode.cpp10
-rw-r--r--src/gui/util/qshadernode_p.h4
3 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h
index fd8ddf6e05..ced6b1430b 100644
--- a/src/gui/util/qshadergraph_p.h
+++ b/src/gui/util/qshadergraph_p.h
@@ -63,6 +63,7 @@ public:
class Edge
{
public:
+ QStringList layers;
QUuid sourceNodeUuid;
QString sourcePortName;
QUuid targetNodeUuid;
diff --git a/src/gui/util/qshadernode.cpp b/src/gui/util/qshadernode.cpp
index f255922c42..676667ddcf 100644
--- a/src/gui/util/qshadernode.cpp
+++ b/src/gui/util/qshadernode.cpp
@@ -72,6 +72,16 @@ void QShaderNode::setUuid(const QUuid &uuid) Q_DECL_NOTHROW
m_uuid = uuid;
}
+QStringList QShaderNode::layers() const Q_DECL_NOTHROW
+{
+ return m_layers;
+}
+
+void QShaderNode::setLayers(const QStringList &layers) Q_DECL_NOTHROW
+{
+ m_layers = layers;
+}
+
QVector<QShaderNodePort> QShaderNode::ports() const Q_DECL_NOTHROW
{
return m_ports;
diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h
index 2f8bf1e438..494c87bc18 100644
--- a/src/gui/util/qshadernode_p.h
+++ b/src/gui/util/qshadernode_p.h
@@ -84,6 +84,9 @@ public:
Q_GUI_EXPORT QUuid uuid() const Q_DECL_NOTHROW;
Q_GUI_EXPORT void setUuid(const QUuid &uuid) Q_DECL_NOTHROW;
+ Q_GUI_EXPORT QStringList layers() const Q_DECL_NOTHROW;
+ Q_GUI_EXPORT void setLayers(const QStringList &layers) Q_DECL_NOTHROW;
+
Q_GUI_EXPORT QVector<QShaderNodePort> ports() const Q_DECL_NOTHROW;
Q_GUI_EXPORT void addPort(const QShaderNodePort &port);
Q_GUI_EXPORT void removePort(const QShaderNodePort &port);
@@ -101,6 +104,7 @@ public:
private:
QUuid m_uuid;
+ QStringList m_layers;
QVector<QShaderNodePort> m_ports;
QHash<QString, QVariant> m_parameters;
QVector<QPair<QShaderFormat, QShaderNode::Rule>> m_rules;