summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2017-07-19 13:49:42 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-08-02 17:34:52 +0000
commit236284357ff389d377cbb42141e71f6093eccba5 (patch)
tree7c522c6c0673cc4c85e960e68699250b8f78e6da /src/gui/util
parentf3c70ab9f316a28c0c71fe94b90de8e42c45d9a5 (diff)
Add support for layers in QShaderGraphLoader format
Change-Id: I5038600e73523ac7eb37a88ddff1f942af18f18e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qshadergraphloader.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/util/qshadergraphloader.cpp b/src/gui/util/qshadergraphloader.cpp
index be9017e545..c7560d9105 100644
--- a/src/gui/util/qshadergraphloader.cpp
+++ b/src/gui/util/qshadergraphloader.cpp
@@ -151,8 +151,15 @@ void QShaderGraphLoader::load()
continue;
}
+ const auto layersArray = nodeObject.value(QStringLiteral("layers")).toArray();
+ auto layers = QStringList();
+ for (const auto &layerValue : layersArray) {
+ layers.append(layerValue.toString());
+ }
+
auto node = m_prototypes.value(type);
node.setUuid(uuid);
+ node.setLayers(layers);
const auto parametersValue = nodeObject.value(QStringLiteral("parameters"));
if (parametersValue.isObject()) {
@@ -218,11 +225,18 @@ void QShaderGraphLoader::load()
const auto targetPort = edgeObject.value(QStringLiteral("targetPort")).toString();
+ const auto layersArray = edgeObject.value(QStringLiteral("layers")).toArray();
+ auto layers = QStringList();
+ for (const auto &layerValue : layersArray) {
+ layers.append(layerValue.toString());
+ }
+
auto edge = QShaderGraph::Edge();
edge.sourceNodeUuid = sourceUuid;
edge.sourcePortName = sourcePort;
edge.targetNodeUuid = targetUuid;
edge.targetPortName = targetPort;
+ edge.layers = layers;
m_graph.addEdge(edge);
}