summaryrefslogtreecommitdiffstats
path: root/src/core/transforms/qtransform_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-11-07 19:02:14 +0000
committerPaul Lemire <paul.lemire@kdab.com>2015-11-17 19:41:18 +0000
commit26a118cfbce29014864f6cdddae66cccb65ffb4f (patch)
treedaea9f2fc41c1df586c35cd56daa61f920ce5b58 /src/core/transforms/qtransform_p.h
parentace675a084ab944a245500b9f54be653126c3147 (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/core/transforms/qtransform_p.h')
-rw-r--r--src/core/transforms/qtransform_p.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index 523842d6e..1d98d901e 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DCore {
-class QTransform;
class QTransformPrivate : public QComponentPrivate
{
Q_DECLARE_PUBLIC(QTransform)
@@ -62,22 +61,15 @@ class QTransformPrivate : public QComponentPrivate
public:
QTransformPrivate();
- void _q_transformDestroyed(QObject *obj);
- void _q_update();
- QMatrix4x4 applyTransforms() const;
-
- mutable bool m_transformsDirty;
- QList<QAbstractTransform*> m_transforms;
-
- mutable bool m_matrixDirty;
- mutable QMatrix4x4 m_matrix;
-
// Stored in this order as QQuaternion is bigger than QVector3D
// Operations are applied in the order of:
// scale, rotation, translation
QQuaternion m_rotation;
QVector3D m_scale;
QVector3D m_translation;
+
+ mutable QMatrix4x4 m_matrix;
+ mutable bool m_matrixDirty;
};
} // namespace Qt3DCore