diff options
19 files changed, 103 insertions, 103 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index f0c55742c..d9c02ea3b 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/window.h> #include <Qt3DCore/camera.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DRenderer/qtorusmesh.h> #include <Qt3DRenderer/qmesh.h> @@ -120,7 +120,7 @@ int main(int ac, char **av) // Camera Qt3D::Camera *cameraEntity = new Qt3D::Camera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); - Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens(); + Qt3D::QCameraLens *cameraLens = new Qt3D::QCameraLens(); Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); Qt3D::QLookAtTransform *cameraLookAtTransform = new Qt3D::QLookAtTransform(); diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index 9d68641fd..612667df6 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -44,7 +44,7 @@ #include <Qt3DCore/window.h> #include <Qt3DCore/camera.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DRenderer/qtorusmesh.h> #include <Qt3DRenderer/qmesh.h> @@ -80,7 +80,7 @@ int main(int argc, char **argv) // Camera Qt3D::Camera *cameraEntity = new Qt3D::Camera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); - Qt3D::CameraLens *cameraLens = new Qt3D::CameraLens(); + Qt3D::QCameraLens *cameraLens = new Qt3D::QCameraLens(); Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); Qt3D::QLookAtTransform *cameraLookAtTransform = new Qt3D::QLookAtTransform(); diff --git a/src/core/cameracontroller.cpp b/src/core/cameracontroller.cpp index 88c8cfd4e..4f37455fc 100644 --- a/src/core/cameracontroller.cpp +++ b/src/core/cameracontroller.cpp @@ -45,7 +45,7 @@ #include <QKeyEvent> #include <camera.h> -#include <cameralens.h> +#include <qcameralens.h> #include <qentity.h> #include <qmatrixtransform.h> diff --git a/src/core/core-components/camera.cpp b/src/core/core-components/camera.cpp index 572a3e027..1d3e5d9cb 100644 --- a/src/core/core-components/camera.cpp +++ b/src/core/core-components/camera.cpp @@ -41,7 +41,7 @@ #include "camera.h" #include "camera_p.h" -#include "cameralens.h" +#include "qcameralens.h" #include <qtransform.h> #include <qlookattransform.h> @@ -55,13 +55,13 @@ Camera::Camera(QNode *parent) : QEntity(parent) qDebug() << Q_FUNC_INFO; } -CameraLens *Camera::lens() const +QCameraLens *Camera::lens() const { Q_D(const Camera); return d->m_lens; } -void Camera::setLens(CameraLens *lens) +void Camera::setLens(QCameraLens *lens) { Q_D(Camera); if (d->m_lens != lens) { diff --git a/src/core/core-components/camera.h b/src/core/core-components/camera.h index 569642baf..9d2e3d4d4 100644 --- a/src/core/core-components/camera.h +++ b/src/core/core-components/camera.h @@ -54,13 +54,13 @@ QT_BEGIN_NAMESPACE namespace Qt3D { class CameraPrivate; -class CameraLens; +class QCameraLens; class QTransform; class QT3DCORESHARED_EXPORT Camera : public QEntity { Q_OBJECT - Q_PROPERTY(Qt3D::CameraLens *lens READ lens WRITE setLens NOTIFY lensChanged) + Q_PROPERTY(Qt3D::QCameraLens *lens READ lens WRITE setLens NOTIFY lensChanged) Q_PROPERTY(Qt3D::QTransform *transform READ transform WRITE setTransform NOTIFY transformChanged) public: @@ -72,8 +72,8 @@ public: DontTranslateViewCenter }; - CameraLens* lens() const; - void setLens(CameraLens *lens); + QCameraLens* lens() const; + void setLens(QCameraLens *lens); QTransform *transform() const; void setTransform(QTransform* lookAt); diff --git a/src/core/core-components/camera_p.h b/src/core/core-components/camera_p.h index ac8e498ef..e8961644b 100644 --- a/src/core/core-components/camera_p.h +++ b/src/core/core-components/camera_p.h @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#ifndef CAMERA_P_H -#define CAMERA_P_H +#ifndef QT3D_CAMERA_P_H +#define QT3D_CAMERA_P_H #include <QMatrix4x4> #include <QVector3D> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qtransform.h> @@ -66,7 +66,7 @@ public: Q_DECLARE_PUBLIC(Camera) Camera *q_ptr; - CameraLens *m_lens; + QCameraLens *m_lens; QTransform *m_transform; }; @@ -74,4 +74,4 @@ public: QT_END_NAMESPACE -#endif // CAMERA_P_H +#endif // QT3D_CAMERA_P_H diff --git a/src/core/core-components/core-components.pri b/src/core/core-components/core-components.pri index 83a5ba3d0..2c4580a24 100644 --- a/src/core/core-components/core-components.pri +++ b/src/core/core-components/core-components.pri @@ -1,8 +1,8 @@ HEADERS += \ $$PWD/camera_p.h \ $$PWD/camera.h \ - $$PWD/cameralens.h \ - $$PWD/cameralens_p.h \ + $$PWD/qcameralens.h \ + $$PWD/qcameralens_p.h \ $$PWD/qabstractmaterial.h \ $$PWD/qabstractmaterial_p.h \ $$PWD/qabstractmesh.h \ @@ -17,7 +17,7 @@ HEADERS += \ SOURCES += \ $$PWD/camera.cpp \ - $$PWD/cameralens.cpp \ + $$PWD/qcameralens.cpp \ $$PWD/qabstractmaterial.cpp \ $$PWD/qabstractmesh.cpp \ $$PWD/qabstracttechnique.cpp \ diff --git a/src/core/core-components/cameralens.cpp b/src/core/core-components/qcameralens.cpp index 9ad7d904b..2d3c06412 100644 --- a/src/core/core-components/cameralens.cpp +++ b/src/core/core-components/qcameralens.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "cameralens.h" -#include "cameralens_p.h" +#include "qcameralens.h" +#include "qcameralens_p.h" QT_BEGIN_NAMESPACE namespace Qt3D { -CameraLensPrivate::CameraLensPrivate(CameraLens *qq) +QCameraLensPrivate::QCameraLensPrivate(QCameraLens *qq) : QComponentPrivate(qq) - , m_projectionType(CameraLens::OrthogonalProjection) + , m_projectionType(QCameraLens::OrthogonalProjection) , m_nearPlane(0.1f) , m_farPlane(1024.0f) , m_fieldOfView(25.0f) @@ -62,36 +62,36 @@ CameraLensPrivate::CameraLensPrivate(CameraLens *qq) } -CameraLens::CameraLens(QNode *parent) - : QComponent(*new CameraLensPrivate(this), parent) +QCameraLens::QCameraLens(QNode *parent) + : QComponent(*new QCameraLensPrivate(this), parent) { } -CameraLens::CameraLens(CameraLensPrivate &dd, QNode *parent) +QCameraLens::QCameraLens(QCameraLensPrivate &dd, QNode *parent) : QComponent(dd, parent) { } -void CameraLens::setProjectionType(CameraLens::ProjectionType projectionType) +void QCameraLens::setProjectionType(QCameraLens::ProjectionType projectionType) { - Q_D(CameraLens); + Q_D(QCameraLens); if (d->m_projectionType != projectionType) { d->m_projectionType = projectionType; emit projectionTypeChanged(); } } -CameraLens::ProjectionType CameraLens::projectionType() const +QCameraLens::ProjectionType QCameraLens::projectionType() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_projectionType; } -void CameraLens::setOrthographicProjection( float left, float right, +void QCameraLens::setOrthographicProjection( float left, float right, float bottom, float top, float nearPlane, float farPlane ) { - Q_D(CameraLens); + Q_D(QCameraLens); d->m_left = left; d->m_right = right; d->m_bottom = bottom; @@ -102,10 +102,10 @@ void CameraLens::setOrthographicProjection( float left, float right, d->updateOrthogonalProjection(); } -void CameraLens::setPerspectiveProjection( float fieldOfView, float aspectRatio, +void QCameraLens::setPerspectiveProjection( float fieldOfView, float aspectRatio, float nearPlane, float farPlane ) { - Q_D(CameraLens); + Q_D(QCameraLens); d->m_fieldOfView = fieldOfView; d->m_aspectRatio = aspectRatio; d->m_nearPlane = nearPlane; @@ -114,9 +114,9 @@ void CameraLens::setPerspectiveProjection( float fieldOfView, float aspectRatio, d->updatePerpectiveProjection(); } -void CameraLens::setNearPlane(float nearPlane) +void QCameraLens::setNearPlane(float nearPlane) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_nearPlane, nearPlane)) return; d->m_nearPlane = nearPlane; @@ -125,15 +125,15 @@ void CameraLens::setNearPlane(float nearPlane) emit nearPlaneChanged(); } -float CameraLens::nearPlane() const +float QCameraLens::nearPlane() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_nearPlane; } -void CameraLens::setFarPlane(float farPlane) +void QCameraLens::setFarPlane(float farPlane) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_farPlane, farPlane)) return; d->m_farPlane = farPlane; @@ -142,15 +142,15 @@ void CameraLens::setFarPlane(float farPlane) emit farPlaneChanged(); } -float CameraLens::farPlane() const +float QCameraLens::farPlane() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_farPlane; } -void CameraLens::setFieldOfView(float fieldOfView) +void QCameraLens::setFieldOfView(float fieldOfView) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_fieldOfView, fieldOfView)) return; d->m_fieldOfView = fieldOfView; @@ -159,15 +159,15 @@ void CameraLens::setFieldOfView(float fieldOfView) emit fieldOfViewChanged(); } -float CameraLens::fieldOfView() const +float QCameraLens::fieldOfView() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_fieldOfView; } -void CameraLens::setAspectRatio(float aspectRatio) +void QCameraLens::setAspectRatio(float aspectRatio) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_aspectRatio, aspectRatio)) return; d->m_aspectRatio = aspectRatio; @@ -176,15 +176,15 @@ void CameraLens::setAspectRatio(float aspectRatio) emit aspectRatioChanged(); } -float CameraLens::aspectRatio() const +float QCameraLens::aspectRatio() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_aspectRatio; } -void CameraLens::setLeft(float left) +void QCameraLens::setLeft(float left) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_left, left)) return; d->m_left = left; @@ -193,15 +193,15 @@ void CameraLens::setLeft(float left) emit leftChanged(); } -float CameraLens::left() const +float QCameraLens::left() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_left; } -void CameraLens::setRight(float right) +void QCameraLens::setRight(float right) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_right, right)) return; d->m_right = right; @@ -210,15 +210,15 @@ void CameraLens::setRight(float right) emit rightChanged(); } -float CameraLens::right() const +float QCameraLens::right() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_right; } -void CameraLens::setBottom(float bottom) +void QCameraLens::setBottom(float bottom) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_bottom, bottom)) return; d->m_bottom = bottom; @@ -227,15 +227,15 @@ void CameraLens::setBottom(float bottom) emit bottomChanged(); } -float CameraLens::bottom() const +float QCameraLens::bottom() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_bottom; } -void CameraLens::setTop(float top) +void QCameraLens::setTop(float top) { - Q_D(CameraLens); + Q_D(QCameraLens); if (qFuzzyCompare(d->m_top, top)) return; d->m_top = top; @@ -244,15 +244,15 @@ void CameraLens::setTop(float top) emit topChanged(); } -float CameraLens::top() const +float QCameraLens::top() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_top; } -QMatrix4x4 CameraLens::projectionMatrix() const +QMatrix4x4 QCameraLens::projectionMatrix() const { - Q_D(const CameraLens); + Q_D(const QCameraLens); return d->m_projectionMatrix; } diff --git a/src/core/core-components/cameralens.h b/src/core/core-components/qcameralens.h index 664b5a3d6..128135b44 100644 --- a/src/core/core-components/cameralens.h +++ b/src/core/core-components/qcameralens.h @@ -53,9 +53,9 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class CameraLensPrivate; +class QCameraLensPrivate; -class QT3DCORESHARED_EXPORT CameraLens : public QComponent +class QT3DCORESHARED_EXPORT QCameraLens : public QComponent { Q_OBJECT @@ -71,7 +71,7 @@ class QT3DCORESHARED_EXPORT CameraLens : public QComponent Q_PROPERTY(float top READ top WRITE setTop NOTIFY topChanged) public: - explicit CameraLens(QNode *parent = 0); + explicit QCameraLens(QNode *parent = 0); enum ProjectionType { OrthogonalProjection, @@ -127,8 +127,8 @@ Q_SIGNALS: void topChanged(); protected: - Q_DECLARE_PRIVATE(CameraLens) - CameraLens(CameraLensPrivate &dd, QNode *parent = 0); + Q_DECLARE_PRIVATE(QCameraLens) + QCameraLens(QCameraLensPrivate &dd, QNode *parent = 0); }; } // Qt3D diff --git a/src/core/core-components/cameralens_p.h b/src/core/core-components/qcameralens_p.h index e7408b1a8..4c9d1344d 100644 --- a/src/core/core-components/cameralens_p.h +++ b/src/core/core-components/qcameralens_p.h @@ -43,7 +43,7 @@ #define QT3D_CAMERALENS_P_H #include <Qt3DCore/private/qcomponent_p.h> -#include "cameralens.h" +#include "qcameralens.h" #include <QtGui/qmatrix4x4.h> @@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DCORESHARED_EXPORT CameraLensPrivate : public QComponentPrivate +class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate { public: - CameraLensPrivate(CameraLens *qq); + QCameraLensPrivate(QCameraLens *qq); inline void updatePerpectiveProjection() { @@ -68,9 +68,9 @@ public: m_projectionMatrix.ortho(m_left, m_right, m_bottom, m_top, m_nearPlane, m_farPlane); } - Q_DECLARE_PUBLIC(CameraLens) + Q_DECLARE_PUBLIC(QCameraLens) - CameraLens::ProjectionType m_projectionType; + QCameraLens::ProjectionType m_projectionType; float m_nearPlane; float m_farPlane; diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index e47377d76..32e259968 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -41,7 +41,7 @@ #include <QtQml> #include "qt3dquick3dcoreplugin.h" -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/camera.h> #include <Qt3DCore/qscaletransform.h> #include <Qt3DCore/qlookattransform.h> @@ -78,7 +78,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) // We would need qmlRegisterUncreatableExtendedType for that qmlRegisterExtendedType<Qt3D::QNode, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Node"); qmlRegisterExtendedType<Qt3D::Camera, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Camera"); - qmlRegisterType<Qt3D::CameraLens>(uri, 2, 0, "CameraLens"); + qmlRegisterType<Qt3D::QCameraLens>(uri, 2, 0, "CameraLens"); qmlRegisterType<Qt3D::QMatrixTransform>(uri, 2, 0, "MatrixTransform"); qmlRegisterType<Qt3D::QTranslateTransform>(uri, 2, 0, "Translate"); diff --git a/src/render/backend/rendercamera.cpp b/src/render/backend/rendercamera.cpp index 4b5dc4147..1e86328e3 100644 --- a/src/render/backend/rendercamera.cpp +++ b/src/render/backend/rendercamera.cpp @@ -44,7 +44,7 @@ #include "renderlogging.h" #include <Qt3DCore/qtransform.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> @@ -75,7 +75,7 @@ void RenderCamera::setRenderer(Renderer *renderer) m_renderer = renderer; } -void RenderCamera::setPeer(CameraLens *peer) +void RenderCamera::setPeer(QCameraLens *peer) { if (peer != m_peer) { QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter(); diff --git a/src/render/backend/rendercamera.h b/src/render/backend/rendercamera.h index 3b80a4e43..af32d6891 100644 --- a/src/render/backend/rendercamera.h +++ b/src/render/backend/rendercamera.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class CameraLens; +class QCameraLens; namespace Render { @@ -64,7 +64,7 @@ public: ~RenderCamera(); void setRenderer(Renderer *renderer); - void setPeer(CameraLens *peer); + void setPeer(QCameraLens *peer); void setClearColor(); QVector4D clearColor() const { return m_clearColor; } @@ -81,7 +81,7 @@ public: private: Renderer *m_renderer; - CameraLens *m_peer; + QCameraLens *m_peer; QVector4D m_clearColor; diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp index fed308f6b..ab08f2ca0 100644 --- a/src/render/backend/renderentity.cpp +++ b/src/render/backend/renderentity.cpp @@ -53,7 +53,7 @@ #include <sphere.h> #include <Qt3DCore/qentity.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qaspectmanager.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qtransform.h> @@ -170,10 +170,10 @@ void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e) if (m_transform == Q_NULLPTR && qobject_cast<QTransform*>(component) != Q_NULLPTR) { setTransform(qobject_cast<QTransform *>(component)); } - else if (qobject_cast<CameraLens *>(component)) { + else if (qobject_cast<QCameraLens *>(component)) { RenderCamera *cam = m_renderer->cameraManager()->lookupResource(m_frontEndPeer->asEntity()->uuid()); if (cam != Q_NULLPTR) - cam->setPeer(qobject_cast<CameraLens *>(component)); + cam->setPeer(qobject_cast<QCameraLens *>(component)); } else if (qobject_cast<QAbstractMesh *>(component)) { RenderMesh *mesh = m_renderer->meshManager()->lookupResource(m_frontEndPeer->asEntity()->uuid()); @@ -190,7 +190,7 @@ void RenderEntity::sceneChangeEvent(const QSceneChangePtr &e) if (component == m_transform) { setTransform(Q_NULLPTR); } - else if (qobject_cast<CameraLens *>(component)) { + else if (qobject_cast<QCameraLens *>(component)) { RenderCamera *cam = m_renderer->cameraManager()->lookupResource(m_frontEndPeer->asEntity()->uuid()); if (cam != Q_NULLPTR) cam->setPeer(Q_NULLPTR); diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 7ea0f5a9d..2aece3fc9 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -90,7 +90,7 @@ #include "renderlogging.h" #include "qparametermapper.h" -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qabstracteffect.h> #include <qeffect.h> diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp index 8233ece4d..379e08a5f 100644 --- a/src/render/backend/renderscenebuilder.cpp +++ b/src/render/backend/renderscenebuilder.cpp @@ -75,7 +75,7 @@ #include <Qt3DCore/camera.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qentity.h> @@ -195,12 +195,12 @@ Render::FrameGraphNode *RenderSceneBuilder::backendFrameGraphNode(QNode *block) if (cameraEntity && m_renderer->cameraManager()->lookupHandle(cameraEntity->uuid()).isNull()) { HRenderNode nodeHandle = createRenderNode(cameraSelector->camera()); m_renderer->renderNodesManager()->data(nodeHandle)->setParentHandle(m_frameGraphEntityNode); - createRenderElement<CameraLens, RenderCamera, CameraManager>(cameraEntity, m_renderer->cameraManager()); + createRenderElement<QCameraLens, RenderCamera, CameraManager>(cameraEntity, m_renderer->cameraManager()); } cameraSelectorNode->setCameraEntity(cameraEntity); qCDebug(Backend) << Q_FUNC_INFO << "CameraSelector" << cameraSelectorNode->cameraEntity(); if (cameraSelectorNode->cameraEntity() == Q_NULLPTR || - cameraSelectorNode->cameraEntity()->componentsOfType<CameraLens>().isEmpty()) + cameraSelectorNode->cameraEntity()->componentsOfType<QCameraLens>().isEmpty()) qCWarning(Backend) << Q_FUNC_INFO << "No camera or camera lens present in the referenced entity"; return cameraSelectorNode; } @@ -292,7 +292,7 @@ void RenderSceneBuilder::visitEntity(Qt3D::QEntity *entity) // Retrieve Mesh from Entity createRenderElement<QAbstractMesh, RenderMesh, MeshManager>(entity, m_renderer->meshManager()); // Retrieve Camera from Entity - createRenderElement<CameraLens, RenderCamera, CameraManager>(entity, m_renderer->cameraManager()); + createRenderElement<QCameraLens, RenderCamera, CameraManager>(entity, m_renderer->cameraManager()); // Retrieve Layer from Entity createRenderElement<QLayer, RenderLayer, LayerManager>(entity, m_renderer->layerManager()); // Retrieve Lights from Entity diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp index aa8fbbf05..48acfebcc 100644 --- a/src/render/io/assimpparser.cpp +++ b/src/render/io/assimpparser.cpp @@ -44,7 +44,7 @@ #include <Qt3DCore/qtransform.h> #include <qparameter.h> #include <Qt3DCore/qmatrixtransform.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <qmesh.h> #include <QFileInfo> #include <QColor> @@ -616,7 +616,7 @@ void AssimpParser::loadCamera(uint cameraIndex) return ; QEntity *camera = new QEntity(); - CameraLens *lens = new CameraLens(); + QCameraLens *lens = new QCameraLens(); aiMatrix4x4 cm; assimpCamera->GetCameraMatrix(cm); diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index df5b65fec..58a9d33d8 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -53,7 +53,7 @@ #include <Qt3DCore/camera.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qmatrixtransform.h> -#include <Qt3DCore/cameralens.h> +#include <Qt3DCore/qcameralens.h> #include <texture.h> #include <qparameter.h> @@ -395,7 +395,7 @@ QEntity* GLTFParser::node(QString id) if ( jsonObj.contains(KEY_CAMERA) ) { - CameraLens* cam = camera( jsonObj.value(KEY_CAMERA).toString() ); + QCameraLens* cam = camera( jsonObj.value(KEY_CAMERA).toString() ); if (!cam) { qWarning() << "failed to build camera:" << jsonObj.value(KEY_CAMERA) << "on node" << id; @@ -416,7 +416,7 @@ QEntity* GLTFParser::node(QString id) #undef far #endif -CameraLens* GLTFParser::camera(QString id) +QCameraLens* GLTFParser::camera(QString id) { parse(); QJsonObject cams = m_json.object().value(KEY_CAMERAS).toObject(); @@ -439,7 +439,7 @@ CameraLens* GLTFParser::camera(QString id) double near = pObj.value(KEY_ZNEAR).toDouble(); double far = pObj.value(KEY_ZFAR).toDouble(); - CameraLens* result = new CameraLens; + QCameraLens* result = new QCameraLens; result->setPerspectiveProjection(yfov, 1.0, near, far); return result; } else if (camTy == "orthographic") { diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h index 14ec081f7..21b940e84 100644 --- a/src/render/io/gltfparser.h +++ b/src/render/io/gltfparser.h @@ -64,7 +64,7 @@ class QMaterial; class ShaderProgram; class QEffect; class Camera; -class CameraLens; +class QCameraLens; class Texture; class GLTFParser : public AbstractSceneParser @@ -93,7 +93,7 @@ public: QEntity *defaultScene(); MeshDataPtr mesh(QString id); QMaterial *material(QString id); - CameraLens *camera(QString id); + QCameraLens *camera(QString id); private: |