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

EffectMaker: Block adding same effect node twice

Browse Source 
The actual blocking is done at uniform level, as the problem of having
same effect node twice is duplicate uniforms.

Fixes: QDS-11470
Change-Id: I77b15b4a207efaebff39b4f6b1700d70262abcdb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2023-12-05 16:05:06 +02:00
parent 9184db8dfb
commit b5370c435e
8 changed files with 92 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/effectmakernew/effectmakermodel.cpp
View File

@@ -112,6 +112,8 @@ void EffectMakerModel::addNode(const QString &nodeQenPath)
setIsEmpty(false);
bakeShaders();
emit nodesChanged();
}
void EffectMakerModel::moveNode(int fromIdx, int toIdx)
@@ -138,6 +140,8 @@ void EffectMakerModel::removeNode(int idx)
setIsEmpty(true);
else
bakeShaders();
emit nodesChanged();
}
void EffectMakerModel::clear()
@@ -148,6 +152,7 @@ void EffectMakerModel::clear()
endResetModel();
setIsEmpty(true);
emit nodesChanged();
}
QString EffectMakerModel::fragmentShader() const
@@ -181,7 +186,7 @@ const QString &EffectMakerModel::qmlComponentString() const
return m_qmlComponentString;
}
const QList<Uniform *> EffectMakerModel::allUniforms()
const QList<Uniform *> EffectMakerModel::allUniforms() const
{
QList<Uniform *> uniforms = {};
for (const auto &node : std::as_const(m_nodes))
@@ -604,10 +609,6 @@ void EffectMakerModel::openComposition(const QString &path)
return;
}
// Get effects dir
const Utils::FilePath effectsResDir = QmlDesigner::ModelNodeOperations::getEffectsImportDirectory();
const QString effectsResPath = effectsResDir.pathAppended(effectName).toString();
if (json.contains("nodes") && json["nodes"].isArray()) {
const QJsonArray nodesArray = json["nodes"].toArray();
for (const auto &nodeElement : nodesArray) {
@@ -620,6 +621,8 @@ void EffectMakerModel::openComposition(const QString &path)
setIsEmpty(m_nodes.isEmpty());
bakeShaders();
}
emit nodesChanged();
}
void EffectMakerModel::exportResources(const QString &name)
@@ -1438,6 +1441,15 @@ void EffectMakerModel::setCurrentComposition(const QString &newCurrentCompositio
emit currentCompositionChanged();
}
QStringList EffectMakerModel::uniformNames() const
{
QStringList usedList;
const QList<Uniform *> uniforms = allUniforms();
for (const auto uniform : uniforms)
usedList.append(uniform->name());
return usedList;
}
void EffectMakerModel::updateQmlComponent()
{
// Clear possible QML runtime errors