diff options
21 files changed, 79 insertions, 79 deletions
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp index d9c02ea3b..c2ed0cdbd 100644 --- a/examples/cpp_example/main.cpp +++ b/examples/cpp_example/main.cpp @@ -44,7 +44,7 @@ #include <exampleresources.h> #include <Qt3DCore/window.h> -#include <Qt3DCore/camera.h> +#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcameralens.h> @@ -118,7 +118,7 @@ int main(int ac, char **av) scene->setSource(":/assets/test_scene.dae"); // Camera - Qt3D::Camera *cameraEntity = new Qt3D::Camera(); + Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); Qt3D::QCameraLens *cameraLens = new Qt3D::QCameraLens(); Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp index 612667df6..e54890c18 100644 --- a/examples/torus-cpp/main.cpp +++ b/examples/torus-cpp/main.cpp @@ -42,7 +42,7 @@ #include <QGuiApplication> #include <Qt3DCore/window.h> -#include <Qt3DCore/camera.h> +#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcameralens.h> @@ -78,7 +78,7 @@ int main(int argc, char **argv) Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); // Camera - Qt3D::Camera *cameraEntity = new Qt3D::Camera(); + Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(); cameraEntity->setObjectName(QStringLiteral("cameraEntity")); Qt3D::QCameraLens *cameraLens = new Qt3D::QCameraLens(); Qt3D::QTransform *cameraTransform = new Qt3D::QTransform(); diff --git a/src/core/cameracontroller.cpp b/src/core/cameracontroller.cpp index 4f37455fc..25195e06e 100644 --- a/src/core/cameracontroller.cpp +++ b/src/core/cameracontroller.cpp @@ -44,7 +44,7 @@ #include <QMouseEvent> #include <QKeyEvent> -#include <camera.h> +#include <qcamera.h> #include <qcameralens.h> #include <qentity.h> #include <qmatrixtransform.h> @@ -79,7 +79,7 @@ CameraController::CameraController() : * an Entity, a CameraLens and a Transform instead of using the * ready made Camera element, it won't work. */ -void CameraController::setCamera( Camera* cam ) +void CameraController::setCamera( QCamera* cam ) { m_camera = cam; m_camera->lens()->setPerspectiveProjection( 25.0, 1.0, 0.1, 1000 ); @@ -137,9 +137,9 @@ void CameraController::update(double dt) dt *= 10; // Update the camera position and orientation - Camera::CameraTranslationOption option = m_viewCenterFixed - ? Camera::DontTranslateViewCenter - : Camera::TranslateViewCenter; + QCamera::CameraTranslationOption option = m_viewCenterFixed + ? QCamera::DontTranslateViewCenter + : QCamera::TranslateViewCenter; m_camera->translate(dt * QVector3D(m_vx, m_vy, m_vz), option); if (!qFuzzyIsNull(m_panAngle)) { diff --git a/src/core/cameracontroller.h b/src/core/cameracontroller.h index 3a41b1713..b255f0dd7 100644 --- a/src/core/cameracontroller.h +++ b/src/core/cameracontroller.h @@ -56,7 +56,7 @@ class QKeyEvent; namespace Qt3D { -class Camera; +class QCamera; class QEntity; class QT3DCORESHARED_EXPORT CameraController : public QObject @@ -71,7 +71,7 @@ class QT3DCORESHARED_EXPORT CameraController : public QObject public: CameraController(); - void setCamera( Camera* cam ); + void setCamera( QCamera* cam ); void setLinearSpeed( float speed ); float linearSpeed() const; @@ -106,7 +106,7 @@ Q_SIGNALS: void multisampleEnabledChanged(); private: - Camera* m_camera; + QCamera* m_camera; QEntity* m_cameraEntity; float m_vx; diff --git a/src/core/core-components/core-components.pri b/src/core/core-components/core-components.pri index 2c4580a24..5c7a2e1ce 100644 --- a/src/core/core-components/core-components.pri +++ b/src/core/core-components/core-components.pri @@ -1,6 +1,6 @@ HEADERS += \ - $$PWD/camera_p.h \ - $$PWD/camera.h \ + $$PWD/qcamera_p.h \ + $$PWD/qcamera.h \ $$PWD/qcameralens.h \ $$PWD/qcameralens_p.h \ $$PWD/qabstractmaterial.h \ @@ -16,7 +16,7 @@ HEADERS += \ $$PWD/qabstractrenderpass_p.h SOURCES += \ - $$PWD/camera.cpp \ + $$PWD/qcamera.cpp \ $$PWD/qcameralens.cpp \ $$PWD/qabstractmaterial.cpp \ $$PWD/qabstractmesh.cpp \ diff --git a/src/core/core-components/camera.cpp b/src/core/core-components/qcamera.cpp index 1d3e5d9cb..aa154c248 100644 --- a/src/core/core-components/camera.cpp +++ b/src/core/core-components/qcamera.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "camera.h" -#include "camera_p.h" +#include "qcamera.h" +#include "qcamera_p.h" #include "qcameralens.h" #include <qtransform.h> #include <qlookattransform.h> @@ -49,21 +49,21 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -Camera::Camera(QNode *parent) : QEntity(parent) - , d_ptr(new CameraPrivate(this)) +QCamera::QCamera(QNode *parent) : QEntity(parent) + , d_ptr(new QCameraPrivate(this)) { qDebug() << Q_FUNC_INFO; } -QCameraLens *Camera::lens() const +QCameraLens *QCamera::lens() const { - Q_D(const Camera); + Q_D(const QCamera); return d->m_lens; } -void Camera::setLens(QCameraLens *lens) +void QCamera::setLens(QCameraLens *lens) { - Q_D(Camera); + Q_D(QCamera); if (d->m_lens != lens) { if (d->m_lens) removeComponent(d->m_lens); @@ -74,15 +74,15 @@ void Camera::setLens(QCameraLens *lens) } } -QTransform *Camera::transform() const +QTransform *QCamera::transform() const { - Q_D(const Camera); + Q_D(const QCamera); return d->m_transform; } -void Camera::setTransform(QTransform *transform) +void QCamera::setTransform(QTransform *transform) { - Q_D(Camera); + Q_D(QCamera); if (d->m_transform != transform) { if (d->m_transform) removeComponent(d->m_transform); @@ -93,9 +93,9 @@ void Camera::setTransform(QTransform *transform) } } -void Camera::translate( const QVector3D& vLocal, CameraTranslationOption option ) +void QCamera::translate( const QVector3D& vLocal, CameraTranslationOption option ) { - Q_D(Camera); + Q_D(QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return; @@ -135,9 +135,9 @@ void Camera::translate( const QVector3D& vLocal, CameraTranslationOption option lookAt->setUpVector(QVector3D::crossProduct( x, lookAt->viewVector() ).normalized()); } -void Camera::translateWorld(const QVector3D& vWorld , CameraTranslationOption option ) +void QCamera::translateWorld(const QVector3D& vWorld , CameraTranslationOption option ) { - Q_D(Camera); + Q_D(QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return ; @@ -153,9 +153,9 @@ void Camera::translateWorld(const QVector3D& vWorld , CameraTranslationOption op lookAt->setViewVector(lookAt->viewCenter() - lookAt->position()); } -QQuaternion Camera::tiltRotation(float angle) const +QQuaternion QCamera::tiltRotation(float angle) const { - Q_D(const Camera); + Q_D(const QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return QQuaternion(); @@ -164,63 +164,63 @@ QQuaternion Camera::tiltRotation(float angle) const return QQuaternion::fromAxisAndAngle( xBasis, -angle ); } -QQuaternion Camera::panRotation(float angle) const +QQuaternion QCamera::panRotation(float angle) const { - Q_D(const Camera); + Q_D(const QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return QQuaternion(); return QQuaternion::fromAxisAndAngle( lookAt->upVector(), angle ); } -QQuaternion Camera::rollRotation(float angle) const +QQuaternion QCamera::rollRotation(float angle) const { - Q_D(const Camera); + Q_D(const QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return QQuaternion(); return QQuaternion::fromAxisAndAngle( lookAt->viewVector(), -angle ); } -void Camera::tilt( const float& angle ) +void QCamera::tilt( const float& angle ) { QQuaternion q = tiltRotation( angle ); rotate( q ); } -void Camera::pan( const float& angle ) +void QCamera::pan( const float& angle ) { QQuaternion q = panRotation( -angle ); rotate( q ); } -void Camera::roll( const float& angle ) +void QCamera::roll( const float& angle ) { QQuaternion q = rollRotation( -angle ); rotate( q ); } -void Camera::tiltAboutViewCenter( const float& angle ) +void QCamera::tiltAboutViewCenter( const float& angle ) { QQuaternion q = tiltRotation( -angle ); rotateAboutViewCenter( q ); } -void Camera::panAboutViewCenter( const float& angle ) +void QCamera::panAboutViewCenter( const float& angle ) { QQuaternion q = panRotation( angle ); rotateAboutViewCenter( q ); } -void Camera::rollAboutViewCenter( const float& angle ) +void QCamera::rollAboutViewCenter( const float& angle ) { QQuaternion q = rollRotation( angle ); rotateAboutViewCenter( q ); } -void Camera::rotate( const QQuaternion& q ) +void QCamera::rotate( const QQuaternion& q ) { - Q_D(Camera); + Q_D(QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return ; @@ -229,9 +229,9 @@ void Camera::rotate( const QQuaternion& q ) lookAt->setViewCenter(lookAt->position() + cameraToCenter); } -void Camera::rotateAboutViewCenter( const QQuaternion& q ) +void QCamera::rotateAboutViewCenter( const QQuaternion& q ) { - Q_D(Camera); + Q_D(QCamera); QLookAtTransform *lookAt = d->m_transform->findFirstTransform<QLookAtTransform>(); if (lookAt == Q_NULLPTR) return ; diff --git a/src/core/core-components/camera.h b/src/core/core-components/qcamera.h index 9d2e3d4d4..ad8a14dae 100644 --- a/src/core/core-components/camera.h +++ b/src/core/core-components/qcamera.h @@ -53,18 +53,18 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class CameraPrivate; +class QCameraPrivate; class QCameraLens; class QTransform; -class QT3DCORESHARED_EXPORT Camera : public QEntity +class QT3DCORESHARED_EXPORT QCamera : public QEntity { Q_OBJECT Q_PROPERTY(Qt3D::QCameraLens *lens READ lens WRITE setLens NOTIFY lensChanged) Q_PROPERTY(Qt3D::QTransform *transform READ transform WRITE setTransform NOTIFY transformChanged) public: - explicit Camera(QNode *parent = 0); + explicit QCamera(QNode *parent = 0); enum CameraTranslationOption { @@ -106,10 +106,10 @@ Q_SIGNALS: void transformChanged(); protected: - Q_DECLARE_PRIVATE(Camera) + Q_DECLARE_PRIVATE(QCamera) private: - CameraPrivate* d_ptr; + QCameraPrivate* d_ptr; }; } // namespace Qt3D diff --git a/src/core/core-components/camera_p.h b/src/core/core-components/qcamera_p.h index e8961644b..f34a6c053 100644 --- a/src/core/core-components/camera_p.h +++ b/src/core/core-components/qcamera_p.h @@ -53,18 +53,18 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DCORESHARED_EXPORT CameraPrivate +class QT3DCORESHARED_EXPORT QCameraPrivate { public: - CameraPrivate(Camera *qq) + QCameraPrivate(QCamera *qq) : q_ptr(qq), m_lens(Q_NULLPTR), m_transform(Q_NULLPTR) { } - Q_DECLARE_PUBLIC(Camera) - Camera *q_ptr; + Q_DECLARE_PUBLIC(QCamera) + QCamera *q_ptr; QCameraLens *m_lens; QTransform *m_transform; diff --git a/src/core/window.cpp b/src/core/window.cpp index 8d2fc9bc2..c04dbfcce 100644 --- a/src/core/window.cpp +++ b/src/core/window.cpp @@ -47,7 +47,7 @@ #include <QGuiApplication> #include "qnode.h" -#include "camera.h" +#include "qcamera.h" #include "qentity.h" #include "corelogging.h" #include "qaspectengine.h" @@ -134,7 +134,7 @@ void Window::resizeEvent( QResizeEvent* e ) } -void Window::setCamera(Camera *camera) +void Window::setCamera(QCamera *camera) { m_camera = camera; } diff --git a/src/core/window.h b/src/core/window.h index e98943e9e..aff13d7bb 100644 --- a/src/core/window.h +++ b/src/core/window.h @@ -53,7 +53,7 @@ namespace Qt3D { class QAbstractAspect; class QAspectEngine; -class Camera; +class QCamera; // temporary solution to get control over camera class CameraController; @@ -69,7 +69,7 @@ public: QSharedPointer<QObject> rootObject() { return m_root; } void registerAspect(QAbstractAspect *aspect); - virtual void setCamera(Camera *camera); + virtual void setCamera(QCamera *camera); protected: virtual void keyPressEvent(QKeyEvent *e); @@ -90,7 +90,7 @@ protected: // The various aspects (subsystems) that will be interested in (parts) // of the objects in the object tree. QAspectEngine *m_aspectEngine; - Camera* m_camera; + QCamera* m_camera; // temporary, borrowed from training material CameraController* m_controller; diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 32e259968..1b5f07e3b 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -42,7 +42,7 @@ #include <QtQml> #include "qt3dquick3dcoreplugin.h" #include <Qt3DCore/qcameralens.h> -#include <Qt3DCore/camera.h> +#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qscaletransform.h> #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qmatrixtransform.h> @@ -77,7 +77,7 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) // 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"); - qmlRegisterExtendedType<Qt3D::Camera, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Camera"); + qmlRegisterExtendedType<Qt3D::QCamera, Qt3D::Quick::Quick3DNode>(uri, 2, 0, "Camera"); qmlRegisterType<Qt3D::QCameraLens>(uri, 2, 0, "CameraLens"); qmlRegisterType<Qt3D::QMatrixTransform>(uri, 2, 0, "MatrixTransform"); diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.cpp b/src/quick3d/quick3d/items/quick3dconfiguration.cpp index 7a24022d7..e511c981a 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.cpp +++ b/src/quick3d/quick3d/items/quick3dconfiguration.cpp @@ -55,7 +55,7 @@ Quick3DConfiguration::Quick3DConfiguration(QObject *parent) { } -void Quick3DConfiguration::setControlledCamera(Camera *camera) +void Quick3DConfiguration::setControlledCamera(QCamera *camera) { if (m_camera != camera) { m_camera = camera; @@ -64,7 +64,7 @@ void Quick3DConfiguration::setControlledCamera(Camera *camera) } } -Camera *Quick3DConfiguration::controlledCamera() const +QCamera *Quick3DConfiguration::controlledCamera() const { return m_camera; } diff --git a/src/quick3d/quick3d/items/quick3dconfiguration.h b/src/quick3d/quick3d/items/quick3dconfiguration.h index 768892487..2e14640e4 100644 --- a/src/quick3d/quick3d/items/quick3dconfiguration.h +++ b/src/quick3d/quick3d/items/quick3dconfiguration.h @@ -49,25 +49,25 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Camera; +class QCamera; namespace Quick { class QT3DQUICKSHARED_EXPORT Quick3DConfiguration : public QObject { Q_OBJECT - Q_PROPERTY(Qt3D::Camera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) + Q_PROPERTY(Qt3D::QCamera *controlledCamera READ controlledCamera WRITE setControlledCamera NOTIFY controlledCameraChanged) public: explicit Quick3DConfiguration(QObject *parent = 0); - void setControlledCamera(Camera *camera); - Camera *controlledCamera() const; + void setControlledCamera(QCamera *camera); + QCamera *controlledCamera() const; Q_SIGNALS: void controlledCameraChanged(); private: - Camera *m_camera; + QCamera *m_camera; }; } // Quick diff --git a/src/quick3d/quick3d/quickwindow.cpp b/src/quick3d/quick3d/quickwindow.cpp index 720d52317..d19845440 100644 --- a/src/quick3d/quick3d/quickwindow.cpp +++ b/src/quick3d/quick3d/quickwindow.cpp @@ -108,7 +108,7 @@ void QuickWindow::setSource(const QUrl& source) } } -void QuickWindow::setCamera(Camera *camera) +void QuickWindow::setCamera(QCamera *camera) { Window::setCamera(camera); if (m_camera) { diff --git a/src/quick3d/quick3d/quickwindow.h b/src/quick3d/quick3d/quickwindow.h index a3599f864..926a5e521 100644 --- a/src/quick3d/quick3d/quickwindow.h +++ b/src/quick3d/quick3d/quickwindow.h @@ -70,7 +70,7 @@ public: Status status() const; void setSource(const QUrl& url); - void setCamera(Camera *camera); + void setCamera(QCamera *camera); static QuickWindow *getInstance(); QQmlEngine *engine() const; diff --git a/src/render/backend/renderer.h b/src/render/backend/renderer.h index 48520eac7..b2bcc2625 100644 --- a/src/render/backend/renderer.h +++ b/src/render/backend/renderer.h @@ -65,7 +65,7 @@ class QSurface; namespace Qt3D { -class Camera; +class QCamera; class QEntity; class QMaterial; class ShaderProgram; diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp index 379e08a5f..36caeb162 100644 --- a/src/render/backend/renderscenebuilder.cpp +++ b/src/render/backend/renderscenebuilder.cpp @@ -74,7 +74,7 @@ #include <layerfilternode.h> -#include <Qt3DCore/camera.h> +#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qentity.h> diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h index f292590b2..8c9f368c0 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.h +++ b/src/render/frontend/framegraph-components/qcameraselector.h @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Camera; +class QCamera; class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphItem diff --git a/src/render/io/assimpparser.h b/src/render/io/assimpparser.h index 61a22c7d7..6ead76383 100644 --- a/src/render/io/assimpparser.h +++ b/src/render/io/assimpparser.h @@ -64,7 +64,7 @@ namespace Qt3D { class QMaterial; class ShaderProgram; class QEffect; -class Camera; +class QCamera; class Texture; class QMesh; @@ -86,7 +86,7 @@ public: QEntity *defaultScene(); MeshDataPtr mesh(QString id); QMaterial *material(QString id); - Camera *camera(QString id); + QCamera *camera(QString id); private : diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp index 58a9d33d8..c8a0ca143 100644 --- a/src/render/io/gltfparser.cpp +++ b/src/render/io/gltfparser.cpp @@ -50,7 +50,7 @@ #include <qtechnique.h> #include <shaderprogram.h> #include <qeffect.h> -#include <Qt3DCore/camera.h> +#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/qcameralens.h> diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h index 21b940e84..57ac2248c 100644 --- a/src/render/io/gltfparser.h +++ b/src/render/io/gltfparser.h @@ -63,7 +63,7 @@ namespace Qt3D { class QMaterial; class ShaderProgram; class QEffect; -class Camera; +class QCamera; class QCameraLens; class Texture; |