diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-16 13:42:13 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-02 10:19:23 +0000 |
commit | 3dc7636713c98ce2748d367f8525fcab85a6c425 (patch) | |
tree | 12411317058e10feae817e25c33f0e5e24577298 /src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h | |
parent | 437593e677cd1ed85ef846a3488dc3212fdde54a (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/Qt3DSDMAnimation.h')
-rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h index c2a7c3b8..361e522b 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMAnimation.h @@ -519,6 +519,10 @@ struct SAnimatableArityVisitor { return std::tuple<bool, size_t>(true, 3); } + std::tuple<bool, size_t> operator()(const SFloat4 &) const + { + return std::tuple<bool, size_t>(true, 4); + } template <typename TDataType> std::tuple<bool, size_t> operator()(const TDataType &) const { @@ -548,6 +552,8 @@ inline std::tuple<bool, size_t> GetDatatypeAnimatableAndArity(DataModelDataType: return std::make_tuple(true, 2); case DataModelDataType::Float3: return std::make_tuple(true, 3); + case DataModelDataType::Float4: + return std::make_tuple(true, 4); } } |