diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-01 10:06:43 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-12-01 11:05:11 +0000 |
commit | 8896429b547c2fb738f160806cbb7f32013318a0 (patch) | |
tree | 279eb42d1f847e7bb2f08b6999b953bdd621a38a /src/runtime/q3dsanimationmanager.cpp | |
parent | b04cb82aa0cb3c7156e8f180bf02e1740e85bedb (diff) |
Make custom materials and effects store variants
This enables passing the QVariant value to QParameters later on with little
or no adaptation. (e.g. textures are filenames and will still need to be turned
into QAbstractTexture* on the scenemanager level, but many others, like floats
or vectors, will work as-is)
Change-Id: Ibfbb81bc571562f04fa233c86245a0371fd9d217
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/runtime/q3dsanimationmanager.cpp')
-rw-r--r-- | src/runtime/q3dsanimationmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/q3dsanimationmanager.cpp b/src/runtime/q3dsanimationmanager.cpp index 786d64d..94f32e8 100644 --- a/src/runtime/q3dsanimationmanager.cpp +++ b/src/runtime/q3dsanimationmanager.cpp @@ -595,7 +595,7 @@ void Q3DSAnimationManager::updateAnimations(Q3DSSlide *animSourceSlide, Q3DSSlid for (auto it = customMatAnims.cbegin(), itEnd = customMatAnims.cend(); it != itEnd; ++it) { Q3DSCustomMaterialInstance *mat3DS = it.key(); // this is the name - value map with the actual (or the default) values for the custom material instance - const QMap<QString, QString> *dynProps = mat3DS->materialPropertyValues(); + const QVariantMap *dynProps = mat3DS->materialPropertyValues(); // this is the metadata for all the dynamic properties of the custom material const QMap<QString, Q3DSMaterial::PropertyElement> &propMeta = mat3DS->material()->properties(); for (auto propIt = dynProps->cbegin(), propItEnd = dynProps->cend(); propIt != propItEnd; ++propIt) { |