diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2018-01-04 17:17:16 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-01-10 12:28:29 +0000 |
| commit | 4c50eb0794876d0ec023a9f65b8844735d7a2e7c (patch) | |
| tree | 337d14befbf10d90350c8dd4d200b0dc8978146c | |
| parent | 9a7f9875cca21bf58f46300d2085a5879b300c42 (diff) | |
Add brush, cutout, and transmission usage types
Which are needed to parse every custom material.
Change-Id: I318bb3d455b1b68d534340db27e32a206fcf78ff
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | src/runtime/q3dsmaterial.cpp | 9 | ||||
| -rw-r--r-- | src/runtime/q3dsmaterial.h | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/runtime/q3dsmaterial.cpp b/src/runtime/q3dsmaterial.cpp index cb90c0b..1a4ec2d 100644 --- a/src/runtime/q3dsmaterial.cpp +++ b/src/runtime/q3dsmaterial.cpp @@ -73,6 +73,15 @@ bool convertToUsageType(const QStringRef &value, UsageType *type, const char *de } else if (value == QStringLiteral("storage")) { ok = true; *type = Q3DSMaterial::Storage; + } else if (value == QStringLiteral("brush")) { + ok = true; + *type = Q3DSMaterial::Brush; + } else if (value == QStringLiteral("cutout")) { + ok = true; + *type = Q3DSMaterial::Cutout; + } else if (value == QStringLiteral("transmission")) { + ok = true; + *type = Q3DSMaterial::Transmission; } else { if (reader) reader->raiseError(QObject::tr("Invalid %1 \"%2\"").arg(QString::fromUtf8(desc)).arg(value.toString())); diff --git a/src/runtime/q3dsmaterial.h b/src/runtime/q3dsmaterial.h index 00bda21..e157b08 100644 --- a/src/runtime/q3dsmaterial.h +++ b/src/runtime/q3dsmaterial.h @@ -56,7 +56,10 @@ enum UsageType { EmissiveMask, Anisotropy, Gradient, - Storage + Storage, + Brush, + Cutout, + Transmission }; enum FilterType { |