diff options
Diffstat (limited to 'src/core/core-components')
| -rw-r--r-- | src/core/core-components/qcamera.cpp | 34 | ||||
| -rw-r--r-- | src/core/core-components/qcamera.h | 12 | ||||
| -rw-r--r-- | src/core/core-components/qcamera_p.h | 10 | ||||
| -rw-r--r-- | src/core/core-components/qcameralens.cpp | 58 | ||||
| -rw-r--r-- | src/core/core-components/qcameralens.h | 6 | ||||
| -rw-r--r-- | src/core/core-components/qcameralens_p.h | 10 |
6 files changed, 65 insertions, 65 deletions
diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp index 9450ccf5b..5f7b2ef9a 100644 --- a/src/core/core-components/qcamera.cpp +++ b/src/core/core-components/qcamera.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraPrivate + \class Qt3DCore::QCameraPrivate \internal */ QCameraPrivate::QCameraPrivate() @@ -55,7 +55,7 @@ QCameraPrivate::QCameraPrivate() /*! \qmltype Camera - \instantiates Qt3D::QCamera + \instantiates Qt3DCore::QCamera \inherits Entity \inqmlmodule Qt3D \since 5.5 @@ -256,7 +256,7 @@ void QCamera::setProjectionType(QCameraLens::ProjectionType type) } /*! - \qmlproperty enumeration Qt3D::Camera::projectionType + \qmlproperty enumeration Qt3DCore::Camera::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -277,7 +277,7 @@ void QCamera::setNearPlane(float nearPlane) } /*! - \qmlproperty float Qt3D::Camera::nearPlane + \qmlproperty float Qt3DCore::Camera::nearPlane */ float QCamera::nearPlane() const @@ -293,7 +293,7 @@ void QCamera::setFarPlane(float farPlane) } /*! - \qmlproperty float Qt3D::Camera::farPlane + \qmlproperty float Qt3DCore::Camera::farPlane */ float QCamera::farPlane() const @@ -309,7 +309,7 @@ void QCamera::setFieldOfView(float fieldOfView) } /*! - \qmlproperty float Qt3D::Camera::fieldOfView + \qmlproperty float Qt3DCore::Camera::fieldOfView */ float QCamera::fieldOfView() const @@ -325,7 +325,7 @@ void QCamera::setAspectRatio(float aspectRatio) } /*! - \qmlproperty float Qt3D::Camera::aspectRatio + \qmlproperty float Qt3DCore::Camera::aspectRatio */ float QCamera::aspectRatio() const @@ -341,7 +341,7 @@ void QCamera::setLeft(float left) } /*! - \qmlproperty float Qt3D::Camera::left + \qmlproperty float Qt3DCore::Camera::left */ float QCamera::left() const @@ -357,7 +357,7 @@ void QCamera::setRight(float right) } /*! - \qmlproperty float Qt3D::Camera::right + \qmlproperty float Qt3DCore::Camera::right */ float QCamera::right() const @@ -373,7 +373,7 @@ void QCamera::setBottom(float bottom) } /*! - \qmlproperty float Qt3D::Camera::bottom + \qmlproperty float Qt3DCore::Camera::bottom */ float QCamera::bottom() const @@ -389,7 +389,7 @@ void QCamera::setTop(float top) } /*! - \qmlproperty float Qt3D::Camera::top + \qmlproperty float Qt3DCore::Camera::top */ float QCamera::top() const @@ -399,7 +399,7 @@ float QCamera::top() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::Camera::projectionMatrix \readonly */ @@ -416,7 +416,7 @@ void QCamera::setPosition(const QVector3D &position) } /*! - \qmlproperty vector3d Qt3D::Camera::position + \qmlproperty vector3d Qt3DCore::Camera::position */ QVector3D QCamera::position() const @@ -433,7 +433,7 @@ void QCamera::setUpVector(const QVector3D &upVector) } /*! - \qmlproperty vector3d Qt3D::Camera::upVector + \qmlproperty vector3d Qt3DCore::Camera::upVector */ QVector3D QCamera::upVector() const @@ -449,7 +449,7 @@ void QCamera::setViewCenter(const QVector3D &viewCenter) } /*! - \qmlproperty vector3d Qt3D::Camera::viewCenter + \qmlproperty vector3d Qt3DCore::Camera::viewCenter */ QVector3D QCamera::viewCenter() const @@ -459,7 +459,7 @@ QVector3D QCamera::viewCenter() const } /*! - \qmlproperty matrix4x4 Qt3D::Camera::matrix + \qmlproperty matrix4x4 Qt3DCore::Camera::matrix */ QMatrix4x4 QCamera::matrix() const { diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h index e3d6b2e31..9832aa5f9 100644 --- a/src/core/core-components/qcamera.h +++ b/src/core/core-components/qcamera.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_H -#define QT3D_CAMERA_H +#ifndef QT3DCORE_CAMERA_H +#define QT3DCORE_CAMERA_H #include <Qt3DCore/qentity.h> #include <Qt3DCore/qcameralens.h> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QLookAtTransform; class QTransform; @@ -55,7 +55,7 @@ class QT3DCORESHARED_EXPORT QCamera : public QEntity { Q_OBJECT // CameraLens - Q_PROPERTY(Qt3D::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) + Q_PROPERTY(Qt3DCore::QCameraLens::ProjectionType projectionType READ projectionType WRITE setProjectionType NOTIFY projectionTypeChanged) Q_PROPERTY(float nearPlane READ nearPlane WRITE setNearPlane NOTIFY nearPlaneChanged) Q_PROPERTY(float farPlane READ farPlane WRITE setFarPlane NOTIFY farPlaneChanged) Q_PROPERTY(float fieldOfView READ fieldOfView WRITE setFieldOfView NOTIFY fieldOfViewChanged) @@ -167,8 +167,8 @@ protected: QCamera(QCameraPrivate &dd, QNode *parent = 0); }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_H +#endif // QT3DCORE_CAMERA_H diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h index d16ba647f..12eef5b35 100644 --- a/src/core/core-components/qcamera_p.h +++ b/src/core/core-components/qcamera_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERA_P_H -#define QT3D_CAMERA_P_H +#ifndef QT3DCORE_CAMERA_P_H +#define QT3DCORE_CAMERA_P_H // // W A R N I N G @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate { @@ -69,8 +69,8 @@ public: QLookAtTransform *m_lookAt; }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERA_P_H +#endif // QT3DCORE_CAMERA_P_H diff --git a/src/core/core-components/qcameralens.cpp b/src/core/core-components/qcameralens.cpp index 239fe2904..206745c28 100644 --- a/src/core/core-components/qcameralens.cpp +++ b/src/core/core-components/qcameralens.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { /*! - \class Qt3D::QCameraLensPrivate + \class Qt3DCore::QCameraLensPrivate \internal */ QCameraLensPrivate::QCameraLensPrivate() @@ -87,10 +87,10 @@ void QCameraLens::copy(const QNode *ref) d_func()->m_projectionMatrix = lens->d_func()->m_projectionMatrix; } -/*! \class Qt3D::QCameraLens +/*! \class Qt3DCore::QCameraLens * \inmodule Qt3DCore * - * \brief Qt3D::QCameraLens specifies the projection matrix that will be used to + * \brief Qt3DCore::QCameraLens specifies the projection matrix that will be used to * define a Camera for a 3D scene. * * \since 5.5 @@ -105,8 +105,8 @@ QCameraLens::QCameraLens(QCameraLensPrivate &dd, QNode *parent) /*! * Sets the lens' projection type \a projectionType. * - * \note Qt3D::QCameraLens::Frustum and - * Qt3D::QCameraLens::PerspectiveProjection are two different ways of + * \note Qt3DCore::QCameraLens::Frustum and + * Qt3DCore::QCameraLens::PerspectiveProjection are two different ways of * specifying the same projection. */ void QCameraLens::setProjectionType(QCameraLens::ProjectionType projectionType) @@ -239,7 +239,7 @@ float QCameraLens::farPlane() const * a projection matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setFieldOfView(float fieldOfView) { @@ -255,7 +255,7 @@ void QCameraLens::setFieldOfView(float fieldOfView) * Returns the projection's field of view in degrees. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::fieldOfView() const { @@ -268,7 +268,7 @@ float QCameraLens::fieldOfView() const * matrix update. * * \note this has no effect if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setAspectRatio(float aspectRatio) { @@ -284,7 +284,7 @@ void QCameraLens::setAspectRatio(float aspectRatio) * Returns the projection's aspect ratio. * * \note: The return value may be undefined if the projection type is not - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::aspectRatio() const { @@ -297,7 +297,7 @@ float QCameraLens::aspectRatio() const * triggers a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setLeft(float left) { @@ -313,7 +313,7 @@ void QCameraLens::setLeft(float left) * Returns the lower left window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::left() const { @@ -326,7 +326,7 @@ float QCameraLens::left() const * a projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setRight(float right) { @@ -342,7 +342,7 @@ void QCameraLens::setRight(float right) * Returns the upper right window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::right() const { @@ -355,7 +355,7 @@ float QCameraLens::right() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setBottom(float bottom) { @@ -371,7 +371,7 @@ void QCameraLens::setBottom(float bottom) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::bottom() const { @@ -384,7 +384,7 @@ float QCameraLens::bottom() const * projection matrix update. * * \note this has no effect if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ void QCameraLens::setTop(float top) { @@ -400,7 +400,7 @@ void QCameraLens::setTop(float top) * Returns the bottom window coordinate of the projection. * * \note The return value may be undefined if the projection type is - * Qt3D::QCameraLens::PerspectiveProjection. + * Qt3DCore::QCameraLens::PerspectiveProjection. */ float QCameraLens::top() const { @@ -421,14 +421,14 @@ QMatrix4x4 QCameraLens::projectionMatrix() const /*! \qmltype CameraLens - \instantiates Qt3D::QCameraLens + \instantiates Qt3DCore::QCameraLens \inqmlmodule Qt3D \inherits Component3D \since 5.5 */ /*! - \qmlproperty enumeration Qt3D::CameraLens::projectionType + \qmlproperty enumeration Qt3DCore::CameraLens::projectionType Holds the type of the camera projection (orthogonal or perspective). @@ -437,39 +437,39 @@ QMatrix4x4 QCameraLens::projectionMatrix() const */ /*! - \qmlproperty float Qt3D::CameraLens::nearPlane + \qmlproperty float Qt3DCore::CameraLens::nearPlane */ /*! - \qmlproperty float Qt3D::CameraLens::farPlane + \qmlproperty float Qt3DCore::CameraLens::farPlane */ /*! - \qmlproperty float Qt3D::CameraLens::fieldOfView + \qmlproperty float Qt3DCore::CameraLens::fieldOfView */ /*! - \qmlproperty float Qt3D::CameraLens::aspectRatio + \qmlproperty float Qt3DCore::CameraLens::aspectRatio */ /*! - \qmlproperty float Qt3D::CameraLens::left + \qmlproperty float Qt3DCore::CameraLens::left */ /*! - \qmlproperty float Qt3D::CameraLens::right + \qmlproperty float Qt3DCore::CameraLens::right */ /*! - \qmlproperty float Qt3D::CameraLens::bottom + \qmlproperty float Qt3DCore::CameraLens::bottom */ /*! - \qmlproperty float Qt3D::CameraLens::top + \qmlproperty float Qt3DCore::CameraLens::top */ /*! - \qmlproperty matrix4x4 Qt3D::CameraLens::projectionMatrix + \qmlproperty matrix4x4 Qt3DCore::CameraLens::projectionMatrix \readonly */ diff --git a/src/core/core-components/qcameralens.h b/src/core/core-components/qcameralens.h index 7ec77adf7..7877b3a13 100644 --- a/src/core/core-components/qcameralens.h +++ b/src/core/core-components/qcameralens.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_H -#define QT3D_CAMERALENS_H +#ifndef QT3DCORE_CAMERALENS_H +#define QT3DCORE_CAMERALENS_H #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qt3dcore_global.h> @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QCameraLensPrivate; diff --git a/src/core/core-components/qcameralens_p.h b/src/core/core-components/qcameralens_p.h index 94d08c45a..b7ed7e9a8 100644 --- a/src/core/core-components/qcameralens_p.h +++ b/src/core/core-components/qcameralens_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_CAMERALENS_P_H -#define QT3D_CAMERALENS_P_H +#ifndef QT3DCORE_CAMERALENS_P_H +#define QT3DCORE_CAMERALENS_P_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate { @@ -122,8 +122,8 @@ private: } }; -} // namespace Qt3D +} // namespace Qt3DCore QT_END_NAMESPACE -#endif // QT3D_CAMERALENS_P_H +#endif // QT3DCORE_CAMERALENS_P_H |