summaryrefslogtreecommitdiffstats
path: root/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-04-16 13:42:13 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-05-02 10:19:23 +0000
commit3dc7636713c98ce2748d367f8525fcab85a6c425 (patch)
tree12411317058e10feae817e25c33f0e5e24577298 /src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
parent437593e677cd1ed85ef846a3488dc3212fdde54a (diff)
Support alpha channel initial work
In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp')
-rw-r--r--src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
index b6077b04..94c5a594 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMValue.cpp
@@ -46,7 +46,7 @@ SValue::SValue(const QVariant &inData)
case QVariant::Color:
{
const QColor c = inData.value<QColor>();
- *this = qt3dsdm::SFloat3(c.redF(), c.greenF(), c.blueF());
+ *this = qt3dsdm::SFloat4(c.redF(), c.greenF(), c.blueF(), c.alphaF());
break;
}
case QVariant::String:
@@ -110,6 +110,9 @@ QVariant SValue::toQVariant() const
case DataModelDataType::Float3: {
return QVariant::fromValue(get<QVector3D>(*this));
}
+ case DataModelDataType::Float4: {
+ return QVariant::fromValue(get<QVector<float> >(*this));
+ }
case DataModelDataType::Long: {
return QVariant::fromValue(get<qt3ds::QT3DSI32>(*this));
}