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

EffectMaker: Fix incorrect QML parsed values

Browse Source 
Task-number: QDS-11296
Change-Id: I97d725271e61d4e14db23382ff7398353ced845d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Amr Essam
2023-11-17 11:33:50 +02:00
committed by Amr Elsayed
parent c3f9d43aca
commit 901b356ea5
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -682,7 +682,7 @@ void EffectMakerModel::exportResources(const QString &name)
if (line.startsWith("vertexShader")) { if (line.startsWith("vertexShader")) {
QString vsLine = " vertexShader: '" + vsFilename + "'"; QString vsLine = " vertexShader: '" + vsFilename + "'";
qmlStringList[i] = vsLine; qmlStringList[i] = vsLine;
} else if (line.startsWith("fragmentShader")) { } else if (line.startsWith("fragmentShader")) {
QString fsLine = " fragmentShader: '" + fsFilename + "'"; QString fsLine = " fragmentShader: '" + fsFilename + "'";
qmlStringList[i] = fsLine; qmlStringList[i] = fsLine;
} }
@@ -737,16 +737,18 @@ QString EffectMakerModel::valueAsString(const Uniform &uniform)
return QString::number(uniform.value().toDouble()); return QString::number(uniform.value().toDouble());
} else if (uniform.type() == Uniform::Type::Vec2) { } else if (uniform.type() == Uniform::Type::Vec2) {
QVector2D v2 = uniform.value().value<QVector2D>(); QVector2D v2 = uniform.value().value<QVector2D>();
return QString("Qt.point(%1, %2)").arg(v2.x(), v2.y()); return QString("Qt.point(%1, %2)").arg(v2.x()).arg(v2.y());
} else if (uniform.type() == Uniform::Type::Vec3) { } else if (uniform.type() == Uniform::Type::Vec3) {
QVector3D v3 = uniform.value().value<QVector3D>(); QVector3D v3 = uniform.value().value<QVector3D>();
return QString("Qt.vector3d(%1, %2, %3)").arg(v3.x(), v3.y(), v3.z()); return QString("Qt.vector3d(%1, %2, %3)").arg(v3.x()).arg(v3.y()).arg(v3.z());
} else if (uniform.type() == Uniform::Type::Vec4) { } else if (uniform.type() == Uniform::Type::Vec4) {
QVector4D v4 = uniform.value().value<QVector4D>(); QVector4D v4 = uniform.value().value<QVector4D>();
return QString("Qt.vector4d(%1, %2, %3, %4)").arg(v4.x(), v4.y(), v4.z(), v4.w()); return QString("Qt.vector4d(%1, %2, %3, %4)").arg(v4.x()).arg(v4.y()).arg(v4.z()).arg(v4.w());
} else if (uniform.type() == Uniform::Type::Sampler) { } else if (uniform.type() == Uniform::Type::Sampler) {
return getImageElementName(uniform); return getImageElementName(uniform);
} else if (uniform.type() == Uniform::Type::Define || uniform.type() == Uniform::Type::Color) { } else if (uniform.type() == Uniform::Type::Color) {
return QString("\"%1\"").arg(uniform.value().toString());
} else if (uniform.type() == Uniform::Type::Define) {
return uniform.value().toString(); return uniform.value().toString();
} else { } else {
qWarning() << QString("Unhandled const variable type: %1").arg(int(uniform.type())).toLatin1(); qWarning() << QString("Unhandled const variable type: %1").arg(int(uniform.type())).toLatin1();