diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-07-04 10:48:23 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2014-07-05 23:21:49 +0200 |
commit | 97717d5ae0bbf3c9e959ca4a00b38df4a59f977a (patch) | |
tree | 6650ab527324c1dd7685c310338ca66016c40e03 | |
parent | 520c17f8ee68eb525f0cd780353e8c6dc7ea6f7f (diff) |
Renamed Transform to QTransform
Change-Id: Ic7ee353afbc8872f5f5a85662acc190ccae4d178
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | examples/cpp_example/main.cpp | 8 | ||||
-rw-r--r-- | examples/torus-cpp/main.cpp | 6 | ||||
-rw-r--r-- | src/core/core-components/camera.cpp | 6 | ||||
-rw-r--r-- | src/core/core-components/camera.h | 8 | ||||
-rw-r--r-- | src/core/core-components/camera_p.h | 4 | ||||
-rw-r--r-- | src/core/transforms/qtransform.cpp (renamed from src/core/transforms/transform.cpp) | 50 | ||||
-rw-r--r-- | src/core/transforms/qtransform.h (renamed from src/core/transforms/transform.h) | 16 | ||||
-rw-r--r-- | src/core/transforms/qtransform_p.h (renamed from src/core/transforms/transform_p.h) | 14 | ||||
-rw-r--r-- | src/core/transforms/transforms.pri | 6 | ||||
-rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 2 | ||||
-rw-r--r-- | src/quick3d/quick3d/items/quick3dtransform.h | 6 | ||||
-rw-r--r-- | src/render/backend/rendercamera.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/renderentity.cpp | 8 | ||||
-rw-r--r-- | src/render/backend/renderentity.h | 6 | ||||
-rw-r--r-- | src/render/backend/renderscenebuilder.cpp | 4 | ||||
-rw-r--r-- | src/render/io/assimpparser.cpp | 6 | ||||
-rw-r--r-- | src/render/io/gltfparser.cpp | 4 |
17 files changed, 78 insertions, 78 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index 28e8b5741..6ab0745bf 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -61,7 +61,7 @@ #include <Qt3DCore/matrixtransform.h> #include <Qt3DCore/rotatetransform.h> #include <Qt3DCore/lookattransform.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DRenderer/qcameraselector.h> #include <Qt3DRenderer/qrenderpassfilter.h> @@ -95,7 +95,7 @@ int main(int ac, char **av) // TorusMesh Transform Qt3D::TranslateTransform *torusTranslation = new Qt3D::TranslateTransform(); Qt3D::RotateTransform *torusRotation = new Qt3D::RotateTransform(); - Qt3D::Transform *torusTransforms = new Qt3D::Transform(); + Qt3D::QTransform *torusTransforms = new Qt3D::QTransform(); torusTranslation->setTranslation(QVector3D(-5.0f, 3.5f, 2.0f)); torusRotation->setAxis(QVector3D(1, 0, 0)); @@ -107,7 +107,7 @@ int main(int ac, char **av) // Scene file Qt3D::QScene *scene = new Qt3D::QScene(); scene->setObjectName(QStringLiteral("scene")); - Qt3D::Transform *sceneTransform = new Qt3D::Transform(); + Qt3D::QTransform *sceneTransform = new Qt3D::QTransform(); Qt3D::TranslateTransform *sceneTranslateTransform = new Qt3D::TranslateTransform(); sceneTranslateTransform->setDx(2.5); sceneTranslateTransform->setDy(0.5); @@ -121,7 +121,7 @@ int main(int ac, char **av) Qt3D::Camera *cameraEntity = new Qt3D::Camera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens(); - Qt3D::Transform *cameraTransform = new Qt3D::Transform(); + Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); Qt3D::LookAtTransform *cameraLookAtTransform = new Qt3D::LookAtTransform(); cameraLens->setPerspectiveProjection(60.0f, 16.0f/9.0f, 0.1f, 1000.0f); diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index c3e9ddd10..c657cb6f3 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -58,7 +58,7 @@ #include <Qt3DCore/scaletransform.h> #include <Qt3DCore/rotatetransform.h> #include <Qt3DCore/lookattransform.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DRenderer/qcameraselector.h> #include <Qt3DRenderer/qrenderpassfilter.h> @@ -81,7 +81,7 @@ int main(int argc, char **argv) Qt3D::Camera *cameraEntity = new Qt3D::Camera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens(); - Qt3D::Transform *cameraTransform = new Qt3D::Transform(); + Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); Qt3D::LookAtTransform *cameraLookAtTransform = new Qt3D::LookAtTransform(); cameraLens->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); @@ -120,7 +120,7 @@ int main(int argc, char **argv) // TorusMesh Transform Qt3D::ScaleTransform *torusScale = new Qt3D::ScaleTransform(); Qt3D::RotateTransform *torusRotation = new Qt3D::RotateTransform(); - Qt3D::Transform *torusTransforms = new Qt3D::Transform(); + Qt3D::QTransform *torusTransforms = new Qt3D::QTransform(); torusScale->setScale3D(QVector3D(1.5f, 1.0f, 0.5f)); torusRotation->setAngleDeg(45.0f); diff --git a/src/core/core-components/camera.cpp b/src/core/core-components/camera.cpp index fe69813fa..4eb31d5c7 100644 --- a/src/core/core-components/camera.cpp +++ b/src/core/core-components/camera.cpp @@ -42,7 +42,7 @@ #include "camera.h" #include "camera_p.h" #include "cameralens.h" -#include <transform.h> +#include <qtransform.h> #include <lookattransform.h> QT_BEGIN_NAMESPACE @@ -74,13 +74,13 @@ void Camera::setLens(CameraLens *lens) } } -Transform *Camera::transform() const +QTransform *Camera::transform() const { Q_D(const Camera); return d->m_transform; } -void Camera::setTransform(Transform *transform) +void Camera::setTransform(QTransform *transform) { Q_D(Camera); if (d->m_transform != transform) { diff --git a/src/core/core-components/camera.h b/src/core/core-components/camera.h index b20a961c2..569642baf 100644 --- a/src/core/core-components/camera.h +++ b/src/core/core-components/camera.h @@ -55,13 +55,13 @@ namespace Qt3D { class CameraPrivate; class CameraLens; -class Transform; +class QTransform; class QT3DCORESHARED_EXPORT Camera : public QEntity { Q_OBJECT Q_PROPERTY(Qt3D::CameraLens *lens READ lens WRITE setLens NOTIFY lensChanged) - Q_PROPERTY(Qt3D::Transform *transform READ transform WRITE setTransform NOTIFY transformChanged) + Q_PROPERTY(Qt3D::QTransform *transform READ transform WRITE setTransform NOTIFY transformChanged) public: explicit Camera(QNode *parent = 0); @@ -75,8 +75,8 @@ public: CameraLens* lens() const; void setLens(CameraLens *lens); - Transform *transform() const; - void setTransform(Transform* lookAt); + QTransform *transform() const; + void setTransform(QTransform* lookAt); QQuaternion tiltRotation(float angle) const; QQuaternion panRotation(float angle) const; diff --git a/src/core/core-components/camera_p.h b/src/core/core-components/camera_p.h index 737823cfb..cefc30aff 100644 --- a/src/core/core-components/camera_p.h +++ b/src/core/core-components/camera_p.h @@ -47,7 +47,7 @@ #include <Qt3DCore/cameralens.h> #include <Qt3DCore/lookattransform.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ public: Camera *q_ptr; CameraLens *m_lens; - Transform *m_transform; + QTransform *m_transform; }; } // namespace Qt3D diff --git a/src/core/transforms/transform.cpp b/src/core/transforms/qtransform.cpp index b244e9198..4b3997580 100644 --- a/src/core/transforms/transform.cpp +++ b/src/core/transforms/qtransform.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "transform.h" -#include "transform_p.h" +#include "qtransform.h" +#include "qtransform_p.h" #include <Qt3DCore/qscenepropertychange.h> #include <matrixtransform.h> @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -TransformPrivate::TransformPrivate(Transform *qq) +QTransformPrivate::QTransformPrivate(QTransform *qq) : QComponentPrivate(qq) , m_transforms() , m_matrix() @@ -57,22 +57,22 @@ TransformPrivate::TransformPrivate(Transform *qq) { } -Transform::Transform(QNode *parent) - : Qt3D::QComponent(*new TransformPrivate(this), parent) +QTransform::QTransform(QNode *parent) + : Qt3D::QComponent(*new QTransformPrivate(this), parent) { - Q_D(Transform); + Q_D(QTransform); d->m_transformsDirty.fetchAndStoreOrdered(0); } -Transform::Transform(TransformPrivate &dd, QNode *parent) +QTransform::QTransform(QTransformPrivate &dd, QNode *parent) : QComponent(dd, parent) { } -void Transform::setTransformsDirty() +void QTransform::setTransformsDirty() { - Q_D(Transform); + Q_D(QTransform); if (!d->m_transformsDirty.loadAcquire()) { d->m_transformsDirty.fetchAndStoreOrdered(1); QScenePropertyChangePtr e(new QScenePropertyChange(ComponentUpdated, this)); @@ -82,9 +82,9 @@ void Transform::setTransformsDirty() } } -QMatrix4x4 Transform::matrix() const +QMatrix4x4 QTransform::matrix() const { - Q_D(const Transform); + Q_D(const QTransform); if (d->m_transformsDirty.loadAcquire()) { d->m_matrix = applyTransforms(); d->m_transformsDirty.fetchAndStoreOrdered(0); @@ -92,9 +92,9 @@ QMatrix4x4 Transform::matrix() const return d->m_matrix; } -void Transform::setMatrix(const QMatrix4x4 &m) +void QTransform::setMatrix(const QMatrix4x4 &m) { - Q_D(Transform); + Q_D(QTransform); qDeleteAll(d->m_transforms); d->m_transforms.clear(); appendTransform(new MatrixTransform(m)); @@ -104,53 +104,53 @@ void Transform::setMatrix(const QMatrix4x4 &m) /*! The center of rotation for the entity. Defaults to the local origin. */ -QVector3D Transform::rotationCenter() const +QVector3D QTransform::rotationCenter() const { return QVector3D(); } -QList<AbstractTransform *> Transform::transforms() const +QList<AbstractTransform *> QTransform::transforms() const { - Q_D(const Transform); + Q_D(const QTransform); return d->m_transforms; } /*! * The center of rotation for the entity. Defaults to the local origin. */ -void Transform::setRotationCenter(const QVector3D &rc) +void QTransform::setRotationCenter(const QVector3D &rc) { Q_UNUSED(rc); } -void Transform::appendTransform(AbstractTransform *transform) +void QTransform::appendTransform(AbstractTransform *transform) { - Q_D(Transform); + Q_D(QTransform); d->m_transforms.append(transform); QObject::connect(transform, SIGNAL(transformUpdated()), this, SLOT(setTransformsDirty())); setTransformsDirty(); } -void Transform::removeTransform(AbstractTransform *transform) +void QTransform::removeTransform(AbstractTransform *transform) { - Q_D(Transform); + Q_D(QTransform); d->m_transforms.removeOne(transform); QObject::disconnect(transform, SIGNAL(transformUpdated()), this, SLOT(setTransformsDirty())); setTransformsDirty(); } -QMatrix4x4 Transform::applyTransforms() const +QMatrix4x4 QTransform::applyTransforms() const { - Q_D(const Transform); + Q_D(const QTransform); QMatrix4x4 m; Q_FOREACH (const AbstractTransform *t, d->m_transforms) m = t->matrix() * m; return m; } -QList<AbstractTransform *> Transform::transformList() const +QList<AbstractTransform *> QTransform::transformList() const { - Q_D(const Transform); + Q_D(const QTransform); return d->m_transforms; } diff --git a/src/core/transforms/transform.h b/src/core/transforms/qtransform.h index d113903fa..93a376e63 100644 --- a/src/core/transforms/transform.h +++ b/src/core/transforms/qtransform.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_TRANSFORM_H -#define QT3D_TRANSFORM_H +#ifndef QT3D_QTRANSFORM_H +#define QT3D_QTRANSFORM_H #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qt3dcore_global.h> @@ -52,14 +52,14 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class AbstractTransform; -class TransformPrivate; +class QTransformPrivate; -class QT3DCORESHARED_EXPORT Transform : public QComponent +class QT3DCORESHARED_EXPORT QTransform : public QComponent { Q_OBJECT public: - explicit Transform(QNode *parent = 0); + explicit QTransform(QNode *parent = 0); QMatrix4x4 matrix() const; void setMatrix(const QMatrix4x4 &m); @@ -89,12 +89,12 @@ protected: QMatrix4x4 applyTransforms() const; QList<AbstractTransform *> transformList() const; - Q_DECLARE_PRIVATE(Transform) - Transform(TransformPrivate &dd, QNode *parent = 0); + Q_DECLARE_PRIVATE(QTransform) + QTransform(QTransformPrivate &dd, QNode *parent = 0); }; } // namespace Qt3D QT_END_NAMESPACE -#endif // QT3D_TRANSFORM_H +#endif // QT3D_QTRANSFORM_H diff --git a/src/core/transforms/transform_p.h b/src/core/transforms/qtransform_p.h index 4b156076d..80eb1a019 100644 --- a/src/core/transforms/transform_p.h +++ b/src/core/transforms/qtransform_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QT3D_TRANSFORM_P_H -#define QT3D_TRANSFORM_P_H +#ifndef QT3D_QTRANSFORM_P_H +#define QT3D_QTRANSFORM_P_H #include <Qt3DCore/qt3dcore_global.h> #include <private/qcomponent_p.h> @@ -49,14 +49,14 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Transform; +class QTransform; -class TransformPrivate : public QComponentPrivate +class QTransformPrivate : public QComponentPrivate { public: - TransformPrivate(Transform *qq); + QTransformPrivate(QTransform *qq); - Q_DECLARE_PUBLIC(Transform) + Q_DECLARE_PUBLIC(QTransform) mutable QAtomicInt m_transformsDirty; QList<AbstractTransform*> m_transforms; @@ -69,4 +69,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_TRANSFORM_P_H +#endif // QT3D_QTRANSFORM_P_H diff --git a/src/core/transforms/transforms.pri b/src/core/transforms/transforms.pri index 8799ccdfc..9528aba0c 100644 --- a/src/core/transforms/transforms.pri +++ b/src/core/transforms/transforms.pri @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/rotatetransform.cpp \ $$PWD/translatetransform.cpp \ $$PWD/scaletransform.cpp \ - $$PWD/transform.cpp + $$PWD/qtransform.cpp HEADERS += \ $$PWD/abstracttransform.h \ @@ -15,7 +15,7 @@ HEADERS += \ $$PWD/rotatetransform.h \ $$PWD/translatetransform.h \ $$PWD/scaletransform.h \ - $$PWD/transform.h \ - $$PWD/transform_p.h + $$PWD/qtransform.h \ + $$PWD/qtransform_p.h INCLUDEPATH += $$PWD diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index eae9c2b4a..470619e03 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -72,7 +72,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) qmlRegisterType<Qt3D::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); qmlRegisterExtendedType<Qt3D::QEntity, Qt3D::Quick::Quick3DEntity>(uri, 2, 0, "Entity"); - qmlRegisterExtendedType<Qt3D::Transform, Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform"); + qmlRegisterExtendedType<Qt3D::QTransform, Qt3D::Quick::Quick3DTransform>(uri, 2, 0, "Transform"); // Ideally we want to make Node an uncreatable type // We would need qmlRegisterUncreatableExtendedType for that qmlRegisterExtendedType<Qt3D::QNode, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node"); diff --git a/src/quick3d/quick3d/items/quick3dtransform.h b/src/quick3d/quick3d/items/quick3dtransform.h index ab7274859..aab9d243e 100644 --- a/src/quick3d/quick3d/items/quick3dtransform.h +++ b/src/quick3d/quick3d/items/quick3dtransform.h @@ -45,13 +45,13 @@ #include <QtCore/QtGlobal> #include <QQmlListProperty> #include <Qt3DQuick/qt3dquick_global.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> QT_BEGIN_NAMESPACE namespace Qt3D { -class Transform; +class QTransform; namespace Quick { @@ -64,7 +64,7 @@ public: explicit Quick3DTransform(QObject *parent = 0); QQmlListProperty<Qt3D::AbstractTransform> transformList(); - inline Transform *parentTransform() const { return qobject_cast<Qt3D::Transform *>(parent()); } + inline QTransform *parentTransform() const { return qobject_cast<Qt3D::QTransform *>(parent()); } private: static void qmlAppendTransform(QQmlListProperty<Qt3D::AbstractTransform> *list, Qt3D::AbstractTransform *bar); diff --git a/src/render/backend/rendercamera.cpp b/src/render/backend/rendercamera.cpp index 7cbdba033..485ef1002 100644 --- a/src/render/backend/rendercamera.cpp +++ b/src/render/backend/rendercamera.cpp @@ -43,7 +43,7 @@ #include "rendereraspect.h" #include "renderlogging.h" -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DCore/cameralens.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qaspectmanager.h> diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index e6c82ea08..ca96472fb 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -56,7 +56,7 @@ #include <Qt3DCore/cameralens.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <QMatrix4x4> #include <QString> @@ -123,7 +123,7 @@ void RenderEntity::setPeer(QEntity *peer) } } -void RenderEntity::setTransform(Transform *transform) +void RenderEntity::setTransform(QTransform *transform) { if (transform != m_transform) { QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter(); @@ -167,8 +167,8 @@ void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e) case ComponentAdded: { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QComponent *component = propertyChange->m_value.value<QComponent*>(); - if (m_transform == Q_NULLPTR && qobject_cast<Transform*>(component) != Q_NULLPTR) { - setTransform(qobject_cast<Transform *>(component)); + if (m_transform == Q_NULLPTR && qobject_cast<QTransform*>(component) != Q_NULLPTR) { + setTransform(qobject_cast<QTransform *>(component)); } else if (qobject_cast<CameraLens *>(component)) { RenderCamera *cam = m_renderer->cameraManager()->lookupResource(m_frontEndPeer->asEntity()->uuid()); diff --git a/src/render/backend/renderentity.h b/src/render/backend/renderentity.h index d6f7f4551..6eb8f4b2c 100644 --- a/src/render/backend/renderentity.h +++ b/src/render/backend/renderentity.h @@ -56,7 +56,7 @@ class RendererAspect; class Sphere; class QNode; class QEntity; -class Transform; +class QTransform; typedef QHandle<QMatrix4x4, 16> HMatrix; @@ -76,7 +76,7 @@ public: RenderEntity(); ~RenderEntity(); - void setTransform(Transform *transform); + void setTransform(QTransform *transform); void setParentHandle(HRenderNode parentHandle); void setRenderer(Renderer *renderer); void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; @@ -102,7 +102,7 @@ public: private: Renderer *m_renderer; - Transform *m_transform; + QTransform *m_transform; HRenderNode m_handle; HRenderNode m_parentHandle; QVector<HRenderNode > m_childrenHandles; diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp index a394a9656..c5863af36 100644 --- a/src/render/backend/renderscenebuilder.cpp +++ b/src/render/backend/renderscenebuilder.cpp @@ -76,7 +76,7 @@ #include <Qt3DCore/camera.h> #include <Qt3DCore/cameralens.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DCore/qentity.h> QT_BEGIN_NAMESPACE @@ -233,7 +233,7 @@ HRenderNode RenderSceneBuilder::createRenderNode(QEntity *entity) renderNode->setRenderer(m_renderer); renderNode->setPeer(entity); - QList<Transform *> transforms = entity->componentsOfType<Transform>(); + QList<QTransform *> transforms = entity->componentsOfType<QTransform>(); if (!transforms.isEmpty()) renderNode->setTransform(transforms.first()); diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp index edaea3ecb..d810085c3 100644 --- a/src/render/io/assimpparser.cpp +++ b/src/render/io/assimpparser.cpp @@ -41,7 +41,7 @@ #include "assimpparser.h" -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <parameter.h> #include <Qt3DCore/matrixtransform.h> #include <Qt3DCore/cameralens.h> @@ -312,7 +312,7 @@ QEntity *AssimpParser::node(aiNode *node) } // Add Transformations - Transform *transform = new Transform(); + QTransform *transform = new QTransform(); QMatrix4x4 qTransformMatrix = AssimpParser::aiMatrix4x4ToQMatrix4x4(node->mTransformation); transform->setMatrix(qTransformMatrix); entityNode->addComponent(transform); @@ -612,7 +612,7 @@ void AssimpParser::loadCamera(uint cameraIndex) // View Matrix defines camera position & up vector relative to the associated // node in the scene. This is computed in AssimpParser::node // camera->lookAt()->setViewMatrix(); - Transform *transform = new Transform(); + QTransform *transform = new QTransform(); QMatrix4x4 viewMatrix = AssimpParser::aiMatrix4x4ToQMatrix4x4(cm); // CHECK THAT THIS WORKS qCDebug(Render::Io) << Q_FUNC_INFO << "IF CAMERA NOT BEHAVING CORRECTLY LOOK HERE"; diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 901afc02e..2dabddda9 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -51,7 +51,7 @@ #include <shaderprogram.h> #include <qeffect.h> #include <Qt3DCore/camera.h> -#include <Qt3DCore/transform.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DCore/matrixtransform.h> #include <Qt3DCore/cameralens.h> #include <texture.h> @@ -388,7 +388,7 @@ QEntity* GLTFParser::node(QString id) } // ADD MATRIX TRANSFORM COMPONENT TO ENTITY - Transform *trans = new Transform(); + QTransform *trans = new QTransform(); trans->appendTransform(new MatrixTransform(m)); result->addComponent(trans); } |