diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-11-07 19:02:14 +0000 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-17 19:41:18 +0000 |
| commit | 26a118cfbce29014864f6cdddae66cccb65ffb4f (patch) | |
| tree | daea9f2fc41c1df586c35cd56daa61f920ce5b58 /src/render/defaults | |
| parent | ace675a084ab944a245500b9f54be653126c3147 (diff) | |
Remove transforms property of QTransform
Compound transformations are now built up using QMatrix4x4 in both QML
and C++. Updating examples accordingly.
Change-Id: I03c9abf1f6cdd1b56226dc0e16a7ad5ce84516dd
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults')
| -rw-r--r-- | src/render/defaults/qskyboxentity.cpp | 5 | ||||
| -rw-r--r-- | src/render/defaults/qskyboxentity_p.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index 8c9169f42..7834ec2aa 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -76,7 +76,6 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate() , m_gl3RenderPass(new QRenderPass()) , m_mesh(new QCuboidMesh()) , m_transform(new Qt3DCore::QTransform()) - , m_translate(new QTranslateTransform()) , m_textureParameter(new QParameter(QStringLiteral("skyboxTexture"), m_skyboxTexture)) , m_posXImage(new QTextureImage()) , m_posYImage(new QTextureImage()) @@ -140,8 +139,6 @@ void QSkyboxEntityPrivate::init() m_material->setEffect(m_effect); m_material->addParameter(m_textureParameter); - m_transform->addTransform(m_translate); - m_mesh->setXYMeshResolution(QSize(2, 2)); m_mesh->setXZMeshResolution(QSize(2, 2)); m_mesh->setYZMeshResolution(QSize(2, 2)); @@ -268,7 +265,7 @@ void QSkyboxEntity::setCameraPosition(const QVector3D &cameraPosition) Q_D(QSkyboxEntity); if (cameraPosition != d->m_position) { d->m_position = cameraPosition; - d->m_translate->setTranslation(d->m_position); + d->m_transform->setTranslation(d->m_position); emit cameraPositionChanged(); } } diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h index f81bdc21d..b1ee4a506 100644 --- a/src/render/defaults/qskyboxentity_p.h +++ b/src/render/defaults/qskyboxentity_p.h @@ -93,7 +93,6 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate QRenderPass *m_gl3RenderPass; QCuboidMesh *m_mesh; Qt3DCore::QTransform *m_transform; - Qt3DCore::QTranslateTransform *m_translate; QParameter *m_textureParameter; QTextureImage *m_posXImage; QTextureImage *m_posYImage; |