feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Set Uniform properties

Browse Source 
Setting properties with some support functionality ready for UI binding

Change-Id: I9636435c3ddeac74b2dbeec826571abeb4247350
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Amr Essam
2023-08-18 15:39:40 +03:00
committed by Amr Elsayed
parent 6b62b56903
commit a3ee70dfd0
7 changed files with 147 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmldesigner/components/effectmaker/compositionnode.cpp
View File

@@ -3,6 +3,7 @@
#include "compositionnode.h"
#include "effectutils.h"
#include "uniform.h"
#include <QFileInfo>
@@ -64,10 +65,10 @@ void CompositionNode::parse(const QString &qenPath)
return;
}
m_name = json.value("name").toString(); //TODO: there is a difference between name and type
m_name = json.value("name").toString();
m_description = json.value("description").toString();
m_fragmentCode = codeFromJsonArray(json.value("fragmentCode").toArray());
m_vertexCode = codeFromJsonArray(json.value("vertexCode").toArray());
m_fragmentCode = EffectUtils::codeFromJsonArray(json.value("fragmentCode").toArray());
m_vertexCode = EffectUtils::codeFromJsonArray(json.value("vertexCode").toArray());
// parse properties
QJsonArray properties = json.value("properties").toArray();
@@ -84,17 +85,4 @@ void CompositionNode::parse(const QString &qenPath)
}
}
QString CompositionNode::codeFromJsonArray(const QJsonArray &codeArray)
{
if (codeArray.isEmpty())
return {};
QString codeString;
for (const auto &element : codeArray)
codeString += element.toString() + '\n';
codeString.chop(1); // Remove last '\n'
return codeString;
}
} // namespace QmlDesigner