summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire.ecortex.kdab.com>2014-10-27 15:35:33 +0100
committerPaul Lemire <paul.lemire@kdab.com>2014-10-30 17:22:21 +0100
commit1dcaa4a2206e1bfe849cfaf3314c1ed5a3877e89 (patch)
tree68f3c808b014ecafde8555289b057b2e64a4c5b2 /src/plugins
parent8e5345043dd3658cd3f319cd1aee9e746c17fdbd (diff)
QTransform refactored
Change-Id: I9c05c37b7f9576b81169c30686de96c9267e4854 Task-number: QTBUG-41542 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index ee2e6fd0c..8566898aa 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -344,9 +344,8 @@ QEntity *AssimpParser::node(aiNode *node)
}
// Add Transformations
- QTransform *transform = new QTransform();
QMatrix4x4 qTransformMatrix = AssimpParser::aiMatrix4x4ToQMatrix4x4(node->mTransformation);
- transform->setMatrix(qTransformMatrix);
+ QTransform *transform = new QTransform(new QMatrixTransform(qTransformMatrix));
entityNode->addComponent(transform);
// Add Camera
@@ -659,7 +658,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
viewMatrix.lookAt(QVector3D(0, 0, 0),
QVector3D(assimpCamera->mLookAt.x, assimpCamera->mLookAt.y, assimpCamera->mLookAt.z),
QVector3D(0, 0, 0));
- transform->setMatrix(viewMatrix);
+ transform->addTransform(new QMatrixTransform(viewMatrix));
camera->addComponent(transform);
m_scene->m_cameras[cameraNode] = camera;
}