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

QmlDesginer: Add functionality effect preview

Browse Source 
Also some refactoring and fixes to the model

Task-number: QDS-10811
Change-Id: If27b2e8e9bac4d46200ed37bf0aec8255ee19022
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Amr Essam
2023-10-03 10:34:50 +03:00
committed by Amr Elsayed
parent 0ad9b6fb3a
commit 84bbfec651
3 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,8 @@ void EffectMakerModel::addNode(const QString &nodeQenPath)
endInsertRows();
setIsEmpty(false);
bakeShaders();
}
void EffectMakerModel::moveNode(int fromIdx, int toIdx)
@@ -115,6 +117,8 @@ void EffectMakerModel::moveNode(int fromIdx, int toIdx)
beginMoveRows({}, fromIdx, fromIdx, {}, toIdxAdjusted);
m_nodes.move(fromIdx, toIdx);
endMoveRows();
bakeShaders();
}
void EffectMakerModel::removeNode(int idx)
@@ -127,6 +131,8 @@ void EffectMakerModel::removeNode(int idx)
if (m_nodes.isEmpty())
setIsEmpty(true);
else
bakeShaders();
}
void EffectMakerModel::updateBakedShaderVersions()
@@ -170,6 +176,11 @@ void EffectMakerModel::setVertexShader(const QString &newVertexShader)
m_vertexShader = newVertexShader;
}
const QString &EffectMakerModel::qmlComponentString() const
{
return m_qmlComponentString;
}
const QList<Uniform *> EffectMakerModel::allUniforms()
{
QList<Uniform *> uniforms = {};
@@ -601,7 +612,7 @@ QString EffectMakerModel::generateVertexShader(bool includeUniforms)
const bool removeTags = includeUniforms;
s += getDefineProperties();
s += getConstVariables();
// s += getConstVariables(); // Not sure yet, will check on this later
// When the node is complete, add shader code in correct nodes order
// split to root and main parts
@@ -661,7 +672,7 @@ QString EffectMakerModel::generateFragmentShader(bool includeUniforms)
const bool removeTags = includeUniforms;
s += getDefineProperties();
s += getConstVariables();
// s += getConstVariables(); // Not sure yet, will check on this later
// When the node is complete, add shader code in correct nodes order
// split to root and main parts
@@ -787,14 +798,14 @@ void EffectMakerModel::bakeShaders()
// First update the features based on shader content
// This will make sure that next calls to "generate" will produce correct uniforms.
m_shaderFeatures.update(generateVertexShader(false), generateFragmentShader(false), m_previewEffectPropertiesString);
m_shaderFeatures.update(generateVertexShader(false), generateFragmentShader(false),
m_previewEffectPropertiesString);
updateCustomUniforms();
setVertexShader(generateVertexShader());
QString vs = m_vertexShader;
m_baker.setSourceString(vs.toUtf8(), QShader::VertexStage);
QShader vertShader = m_baker.bake();
if (!vertShader.isValid()) {
qWarning() << "Shader baking failed:" << qPrintable(m_baker.errorMessage());
@@ -840,5 +851,20 @@ void EffectMakerModel::setShadersUpToDate(bool UpToDate)
emit shadersUpToDateChanged();
}
QString EffectMakerModel::getQmlComponentString(bool localFiles)
{
Q_UNUSED(localFiles)
// TODO
return QString();
}
void EffectMakerModel::updateQmlComponent()
{
// Clear possible QML runtime errors
resetEffectError(ErrorQMLRuntime);
m_qmlComponentString = getQmlComponentString(false);
}
} // namespace EffectMaker