deserialization: tolerate missing vector values

This commit is contained in:
itsmattkc
2020-09-15 12:00:25 +10:00
parent c0e6fdb836
commit 3ab36eb7fc
2 changed files with 17 additions and 0 deletions
+15
View File
@@ -381,23 +381,38 @@ QString NodeInput::ValueToString(const DataType& data_type, const QVariant &valu
} }
} }
void NodeInput::ValidateVectorString(QStringList* list, int count)
{
while (list->size() < count) {
list->append(QStringLiteral("0"));
}
}
QVariant NodeInput::StringToValue(const DataType& data_type, const QString &string, bool value_is_a_key_track) QVariant NodeInput::StringToValue(const DataType& data_type, const QString &string, bool value_is_a_key_track)
{ {
if (!value_is_a_key_track && data_type == kVec2) { if (!value_is_a_key_track && data_type == kVec2) {
QStringList vals = string.split(':'); QStringList vals = string.split(':');
ValidateVectorString(&vals, 2);
return QVector2D(vals.at(0).toFloat(), vals.at(1).toFloat()); return QVector2D(vals.at(0).toFloat(), vals.at(1).toFloat());
} else if (!value_is_a_key_track && data_type == kVec3) { } else if (!value_is_a_key_track && data_type == kVec3) {
QStringList vals = string.split(':'); QStringList vals = string.split(':');
ValidateVectorString(&vals, 3);
return QVector3D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat()); return QVector3D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat());
} else if (!value_is_a_key_track && data_type == kVec4) { } else if (!value_is_a_key_track && data_type == kVec4) {
QStringList vals = string.split(':'); QStringList vals = string.split(':');
ValidateVectorString(&vals, 4);
return QVector4D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat()); return QVector4D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat());
} else if (!value_is_a_key_track && data_type == kColor) { } else if (!value_is_a_key_track && data_type == kColor) {
QStringList vals = string.split(':'); QStringList vals = string.split(':');
ValidateVectorString(&vals, 4);
return QVariant::fromValue(Color(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat())); return QVariant::fromValue(Color(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat()));
} else if (data_type == kInt) { } else if (data_type == kInt) {
return QVariant::fromValue(string.toLongLong()); return QVariant::fromValue(string.toLongLong());
+2
View File
@@ -321,6 +321,8 @@ private:
void SaveConnections(QXmlStreamWriter* writer) const; void SaveConnections(QXmlStreamWriter* writer) const;
static void ValidateVectorString(QStringList* list, int count);
/** /**
* @brief Returns whether a data type can be interpolated or not * @brief Returns whether a data type can be interpolated or not
*/ */