diff options
Diffstat (limited to 'src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp')
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index c4f7c960..1b5e09f3 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -2439,7 +2439,7 @@ public: } case DataModelDataType::Float2: { - QStringList floats = i.value().split(QStringLiteral(" ")); + QStringList floats = i.value().split(QLatin1Char(' ')); if (floats.length() == 2) { SFloat2 value(floats[0].toFloat(), floats[1].toFloat()); setInstanceValueIfChanged(instance, prop, value); @@ -2448,13 +2448,23 @@ public: } case DataModelDataType::Float3: { - QStringList floats = i.value().split(QStringLiteral(" ")); + QStringList floats = i.value().split(QLatin1Char(' ')); if (floats.length() == 3) { SFloat3 value(floats[0].toFloat(), floats[1].toFloat(), floats[2].toFloat()); setInstanceValueIfChanged(instance, prop, value); } break; } + case DataModelDataType::Float4: + { + QStringList floats = i.value().split(QLatin1Char(' ')); + if (floats.length() == 4) { + SFloat4 value(floats[0].toFloat(), floats[1].toFloat(), floats[2].toFloat(), + floats[3].toFloat()); + setInstanceValueIfChanged(instance, prop, value); + } + break; + } case DataModelDataType::Bool: { if (propString == "True") @@ -2843,8 +2853,8 @@ public: { m_PropertySystem.SetInstancePropertyValue( inInstance, m_Bridge.GetSceneAsset().m_TimebarColor, - qt3dsdm::SFloat3(inColor.GetRed() / 255.0f, inColor.GetGreen() / 255.0f, - inColor.GetBlue() / 255.0f)); + qt3dsdm::SFloat4(inColor.GetRed() / 255.0f, inColor.GetGreen() / 255.0f, + inColor.GetBlue() / 255.0f, 1.0f)); } void SetTimebarText(TInstanceHandle inInstance, const QString &inComment) override |