diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2018-01-25 10:09:23 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2018-02-01 22:23:07 +0000 |
commit | c44c456e77b269cfdf22a8211c4cb5891329bb50 (patch) | |
tree | 4a8aabb947069a847121423861d76e5007ddaa0b /src/plugins/sceneparsers | |
parent | bb548a48c0e5f9e07ccc84c69b4e7e38c8c751cf (diff) |
Cleanup AssimpImporter
And improve error output
Change-Id: I9364e0e610cc758ad322bf96b52f57989c7ed0df
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers')
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.cpp | 19 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.h | 1 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index d46188f34..8db655e37 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -227,13 +227,13 @@ QAttribute *createAttribute(QBuffer *buffer, return attribute; } -QAttribute *createAttribute(QBuffer *buffer, - QAttribute::VertexBaseType vertexBaseType, - uint vertexSize, - uint count, - uint byteOffset = 0, - uint byteStride = 0, - QNode *parent = nullptr) +QAttribute *createIndexAttribute(QBuffer *buffer, + QAttribute::VertexBaseType vertexBaseType, + uint vertexSize, + uint count, + uint byteOffset = 0, + uint byteStride = 0, + QNode *parent = nullptr) { QAttribute *attribute = QAbstractNodeFactory::createNode<QAttribute>("QAttribute"); attribute->setBuffer(buffer); @@ -597,7 +597,8 @@ void AssimpImporter::readSceneFile(const QString &path) aiProcess_GenSmoothNormals| aiProcess_FlipUVs); if (m_scene->m_aiScene == nullptr) { - qCWarning(AssimpImporterLog) << "Assimp scene import failed"; + qCWarning(AssimpImporterLog) << "Assimp scene import failed" << m_scene->m_importer->GetErrorString(); + QSceneImporter::logError(QString::fromUtf8(m_scene->m_importer->GetErrorString())); return ; } parse(); @@ -791,7 +792,7 @@ QGeometryRenderer *AssimpImporter::loadMesh(uint meshIndex) indexBuffer->setData(ibufferContent); // Add indices attributes - QAttribute *indexAttribute = createAttribute(indexBuffer, indiceType, 1, indices); + QAttribute *indexAttribute = createIndexAttribute(indexBuffer, indiceType, 1, indices); indexAttribute->setAttributeType(QAttribute::IndexAttribute); meshGeometry->addAttribute(indexAttribute); diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h index c461cda08..4250a667f 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.h +++ b/src/plugins/sceneparsers/assimp/assimpimporter.h @@ -141,7 +141,6 @@ private: QHash<aiTextureType, QString> m_textureToParameterName; QVector<Qt3DAnimation::QKeyframeAnimation *> m_animations; QVector<Qt3DAnimation::QMorphingAnimation *> m_morphAnimations; -// QMap<aiNode*, Light*> m_lights; }; QDir m_sceneDir; |