diff options
| author | Paul Lemire <paul.lemire.ecortex@kdab.com> | 2014-12-30 15:26:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-31 11:23:52 +0100 |
| commit | 3701990027d9e18bac2cfbb8c536287d2dcc7bd8 (patch) | |
| tree | 98c9432a15001bec576bde990dc5898d95452f4a /src/plugins | |
| parent | bee25daf9efaa688a6954a5b31a07c51db49b8ba (diff) | |
AssimpParser: use QPhongMaterial to provode default coloring
The following examples now have coloring:
cpp-example
multiviewport
assimp
Change-Id: Ib068ea1f169e5eb924f3b363edd9c4f7f4ef854e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 746cf1ae7..3c1dab23b 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -52,6 +52,7 @@ #include <Qt3DRenderer/qbuffer.h> #include <Qt3DRenderer/qattribute.h> #include <Qt3DRenderer/qtexture.h> +#include <Qt3DRenderer/qphongmaterial.h> #include <QFileInfo> #include <QColor> #include <qmath.h> @@ -78,16 +79,16 @@ Q_LOGGING_CATEGORY(AssimpParserLog, "Qt3D.AssimpParser") namespace { -const QString ASSIMP_MATERIAL_DIFFUSE_COLOR = QStringLiteral("diffuse"); -const QString ASSIMP_MATERIAL_SPECULAR_COLOR = QStringLiteral("specular"); -const QString ASSIMP_MATERIAL_AMBIENT_COLOR = QStringLiteral("ambient"); +const QString ASSIMP_MATERIAL_DIFFUSE_COLOR = QStringLiteral("kd"); +const QString ASSIMP_MATERIAL_SPECULAR_COLOR = QStringLiteral("ks"); +const QString ASSIMP_MATERIAL_AMBIENT_COLOR = QStringLiteral("ka"); const QString ASSIMP_MATERIAL_EMISSIVE_COLOR = QStringLiteral("emissive"); const QString ASSIMP_MATERIAL_TRANSPARENT_COLOR = QStringLiteral("transparent"); const QString ASSIMP_MATERIAL_REFLECTIVE_COLOR = QStringLiteral("reflective"); -const QString ASSIMP_MATERIAL_DIFFUSE_TEXTURE = QStringLiteral("diffuseTex"); +const QString ASSIMP_MATERIAL_DIFFUSE_TEXTURE = QStringLiteral("diffuseTexture"); const QString ASSIMP_MATERIAL_AMBIENT_TEXTURE = QStringLiteral("ambientTex"); -const QString ASSIMP_MATERIAL_SPECULAR_TEXTURE = QStringLiteral("specularTex"); +const QString ASSIMP_MATERIAL_SPECULAR_TEXTURE = QStringLiteral("specularTexture"); const QString ASSIMP_MATERIAL_EMISSIVE_TEXTURE = QStringLiteral("emissiveTex"); const QString ASSIMP_MATERIAL_NORMALS_TEXTURE = QStringLiteral("normalsTex"); const QString ASSIMP_MATERIAL_OPACITY_TEXTURE = QStringLiteral("opacityTex"); @@ -428,7 +429,7 @@ void AssimpParser::parse() */ void AssimpParser::loadMaterial(uint materialIndex) { - QMaterial *material = new QMaterial(); + QMaterial *material = new QPhongMaterial(); aiMaterial *assimpMaterial = m_scene->m_aiScene->mMaterials[materialIndex]; // Material Name copyMaterialName(material, assimpMaterial); |