diff options
25 files changed, 102 insertions, 102 deletions
diff --git a/src/core/core.pri b/src/core/core.pri index 0cbb5a19f..db6b4b1a5 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -22,8 +22,6 @@ HEADERS += \ $$PWD/qscenechange_p.h \ $$PWD/qsceneobserverinterface_p.h \ $$PWD/qpostman_p.h \ - $$PWD/qbackendscenepropertychange.h \ - $$PWD/qbackendscenepropertychange_p.h \ $$PWD/qobservableinterface_p.h \ $$PWD/qobserverinterface_p.h \ $$PWD/qlockableobserverinterface_p.h \ @@ -41,7 +39,9 @@ HEADERS += \ $$PWD/qnodepropertychangebase.h \ $$PWD/qnodepropertychangebase_p.h \ $$PWD/qnodepropertychange_p.h \ - $$PWD/qnodepropertychange.h + $$PWD/qnodepropertychange.h \ + $$PWD/qbackendnodepropertychange.h \ + $$PWD/qbackendnodepropertychange_p.h SOURCES += \ $$PWD/qtickclock.cpp \ @@ -55,11 +55,11 @@ SOURCES += \ $$PWD/qsceneobserverinterface.cpp \ $$PWD/qpostman.cpp \ $$PWD/qscene.cpp \ - $$PWD/qbackendscenepropertychange.cpp \ $$PWD/qbackendnodefactory.cpp \ $$PWD/qnodecreatedchange.cpp \ $$PWD/qnodedestroyedchange.cpp \ $$PWD/qcomponentaddedchange.cpp \ $$PWD/qcomponentremovedchange.cpp \ $$PWD/qnodepropertychangebase.cpp \ - $$PWD/qnodepropertychange.cpp + $$PWD/qnodepropertychange.cpp \ + $$PWD/qbackendnodepropertychange.cpp diff --git a/src/core/nodes/qbackendnode.h b/src/core/nodes/qbackendnode.h index c10c84674..03d888da0 100644 --- a/src/core/nodes/qbackendnode.h +++ b/src/core/nodes/qbackendnode.h @@ -99,7 +99,7 @@ private: void setPeerId(QNodeId id) Q_DECL_NOEXCEPT; virtual void initializeFromPeer(const QNodeCreatedChangeBasePtr &change); - friend class QBackendScenePropertyChange; + friend class QBackendNodePropertyChange; friend class QAbstractAspectPrivate; }; diff --git a/src/core/qbackendscenepropertychange.cpp b/src/core/qbackendnodepropertychange.cpp index 7cfc9a604..b79422796 100644 --- a/src/core/qbackendscenepropertychange.cpp +++ b/src/core/qbackendnodepropertychange.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qbackendscenepropertychange.h" -#include "qbackendscenepropertychange_p.h" +#include "qbackendnodepropertychange.h" +#include "qbackendnodepropertychange_p.h" #include <Qt3DCore/qbackendnode.h> #include <Qt3DCore/private/qbackendnode_p.h> @@ -47,46 +47,46 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { /*! - * \class Qt3DCore::QBackendScenePropertyChange - * \inherits Qt3DCore::QScenePropertyChange + * \class Qt3DCore::QBackendNodePropertyChange + * \inherits Qt3DCore::QNodePropertyChangeBase * \inmodule Qt3DCore * * TODO */ -QBackendScenePropertyChangePrivate::QBackendScenePropertyChangePrivate() +QBackendNodePropertyChangePrivate::QBackendNodePropertyChangePrivate() : QNodePropertyChangeBasePrivate() { } -QBackendScenePropertyChangePrivate::~QBackendScenePropertyChangePrivate() +QBackendNodePropertyChangePrivate::~QBackendNodePropertyChangePrivate() { } -QBackendScenePropertyChange::QBackendScenePropertyChange(QNodeId subjectId, QSceneChange::Priority priority) - : QNodePropertyChangeBase(*new QBackendScenePropertyChangePrivate, NodeUpdated, Observable, subjectId, priority) +QBackendNodePropertyChange::QBackendNodePropertyChange(QNodeId subjectId, QSceneChange::Priority priority) + : QNodePropertyChangeBase(*new QBackendNodePropertyChangePrivate, NodeUpdated, Observable, subjectId, priority) { } -QBackendScenePropertyChange::~QBackendScenePropertyChange() +QBackendNodePropertyChange::~QBackendNodePropertyChange() { } /*! * \return property value. */ -QVariant QBackendScenePropertyChange::value() const +QVariant QBackendNodePropertyChange::value() const { - Q_D(const QBackendScenePropertyChange); + Q_D(const QBackendNodePropertyChange); return d->m_value; } /*! * Set the property change \a value. */ -void QBackendScenePropertyChange::setValue(const QVariant &value) +void QBackendNodePropertyChange::setValue(const QVariant &value) { - Q_D(QBackendScenePropertyChange); + Q_D(QBackendNodePropertyChange); d->m_value = value; } @@ -94,32 +94,32 @@ void QBackendScenePropertyChange::setValue(const QVariant &value) /*! * Sets the target node of the backend scene property change to \a id. */ -void QBackendScenePropertyChange::setTargetNode(QNodeId id) +void QBackendNodePropertyChange::setTargetNode(QNodeId id) { - Q_D(QBackendScenePropertyChange); + Q_D(QBackendNodePropertyChange); d->m_targetUuid = id; } /*! * \return the target node id of the backend scene property change. */ -QNodeId QBackendScenePropertyChange::targetNode() const +QNodeId QBackendNodePropertyChange::targetNode() const { - Q_D(const QBackendScenePropertyChange); + Q_D(const QBackendNodePropertyChange); return d->m_targetUuid; } /*! - * \typedef Qt3DCore::QBackendScenePropertyChangePtr - * \relates Qt3DCore::QBackendScenePropertyChange + * \typedef Qt3DCore::QBackendNodePropertyChangePtr + * \relates Qt3DCore::QBackendNodePropertyChange * - * A shared pointer for QBackendScenePropertyChange. + * A shared pointer for QBackendNodePropertyChange. */ /*! * \internal */ -QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd) +QBackendNodePropertyChange::QBackendNodePropertyChange(QBackendNodePropertyChangePrivate &dd) : QNodePropertyChangeBase(dd) { } @@ -127,7 +127,7 @@ QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyCh /*! * \internal */ -QBackendScenePropertyChange::QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, +QBackendNodePropertyChange::QBackendNodePropertyChange(QBackendNodePropertyChangePrivate &dd, QNodeId subjectId, QSceneChange::Priority priority) : QNodePropertyChangeBase(dd, NodeUpdated, Observable, subjectId, priority) { diff --git a/src/core/qbackendscenepropertychange.h b/src/core/qbackendnodepropertychange.h index 634d8a7a5..f85c8ed39 100644 --- a/src/core/qbackendscenepropertychange.h +++ b/src/core/qbackendnodepropertychange.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H -#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H +#ifndef QT3DCORE_QBACKENDNODEPROPERTYCHANGE_H +#define QT3DCORE_QBACKENDNODEPROPERTYCHANGE_H #include <Qt3DCore/qnodepropertychangebase.h> #include <Qt3DCore/qnodeid.h> @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QBackendScenePropertyChangePrivate; +class QBackendNodePropertyChangePrivate; class QBackendNode; -class QT3DCORESHARED_EXPORT QBackendScenePropertyChange : public QNodePropertyChangeBase +class QT3DCORESHARED_EXPORT QBackendNodePropertyChange : public QNodePropertyChangeBase { public: - QBackendScenePropertyChange(QNodeId subjectId, Priority priority = Standard); - virtual ~QBackendScenePropertyChange(); + QBackendNodePropertyChange(QNodeId subjectId, Priority priority = Standard); + virtual ~QBackendNodePropertyChange(); QVariant value() const; void setValue(const QVariant &value); @@ -63,17 +63,17 @@ public: QNodeId targetNode() const; protected: - Q_DECLARE_PRIVATE(QBackendScenePropertyChange) - QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd); - QBackendScenePropertyChange(QBackendScenePropertyChangePrivate &dd, - QNodeId subjectId, Priority priority = Standard); + Q_DECLARE_PRIVATE(QBackendNodePropertyChange) + QBackendNodePropertyChange(QBackendNodePropertyChangePrivate &dd); + QBackendNodePropertyChange(QBackendNodePropertyChangePrivate &dd, + QNodeId subjectId, Priority priority = Standard); }; -typedef QSharedPointer<QBackendScenePropertyChange> QBackendScenePropertyChangePtr; +typedef QSharedPointer<QBackendNodePropertyChange> QBackendNodePropertyChangePtr; } // Qt3D QT_END_NAMESPACE -#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_H +#endif // QT3DCORE_QBACKENDNODEPROPERTYCHANGE_H diff --git a/src/core/qbackendscenepropertychange_p.h b/src/core/qbackendnodepropertychange_p.h index 4914d1741..47ef804fc 100644 --- a/src/core/qbackendscenepropertychange_p.h +++ b/src/core/qbackendnodepropertychange_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H -#define QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H +#ifndef QT3DCORE_QBACKENDNODEPROPERTYCHANGE_P_H +#define QT3DCORE_QBACKENDNODEPROPERTYCHANGE_P_H // // W A R N I N G @@ -58,15 +58,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -class QBackendScenePropertyChange; +class QBackendNodePropertyChange; -class QBackendScenePropertyChangePrivate : public QNodePropertyChangeBasePrivate +class QBackendNodePropertyChangePrivate : public QNodePropertyChangeBasePrivate { public: - QBackendScenePropertyChangePrivate(); - virtual ~QBackendScenePropertyChangePrivate(); + QBackendNodePropertyChangePrivate(); + virtual ~QBackendNodePropertyChangePrivate(); - Q_DECLARE_PUBLIC(QBackendScenePropertyChange) + Q_DECLARE_PUBLIC(QBackendNodePropertyChange) QVariant m_value; QNodeId m_targetUuid; @@ -76,4 +76,4 @@ public: QT_END_NAMESPACE -#endif // QT3DCORE_QBACKENDSCENEPROPERTYCHANGE_P_H +#endif // QT3DCORE_QBACKENDNODEPROPERTYCHANGE_P_H diff --git a/src/core/qpostman.cpp b/src/core/qpostman.cpp index dfab5b99e..4e95e0200 100644 --- a/src/core/qpostman.cpp +++ b/src/core/qpostman.cpp @@ -40,7 +40,7 @@ #include "qpostman_p.h" #include <private/qobject_p.h> #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/private/qlockableobserverinterface_p.h> #include <Qt3DCore/qnode.h> @@ -118,7 +118,7 @@ void QPostman::notifyBackend(const QSceneChangePtr &change) void QPostman::notifyFrontendNode(const QSceneChangePtr &e) { Q_D(QPostman); - QBackendScenePropertyChangePtr change = qSharedPointerCast<QBackendScenePropertyChange>(e); + QBackendNodePropertyChangePtr change = qSharedPointerCast<QBackendNodePropertyChange>(e); if (!change.isNull() && d->m_scene != Q_NULLPTR) { QNode *n = d->m_scene->lookupNode(change->targetNode()); if (n != Q_NULLPTR) diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp index cbe5a5303..732e129ba 100644 --- a/src/input/backend/action.cpp +++ b/src/input/backend/action.cpp @@ -42,7 +42,7 @@ #include <Qt3DInput/qabstractactioninput.h> #include <Qt3DInput/private/qaction_p.h> #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -83,7 +83,7 @@ void Action::setActionTriggered(bool actionTriggered) m_actionTriggered = actionTriggered; // Send change to the frontend - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("active"); e->setValue(m_actionTriggered); diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp index e7f40b8e2..fcfc7b412 100644 --- a/src/input/backend/axis.cpp +++ b/src/input/backend/axis.cpp @@ -42,7 +42,7 @@ #include <Qt3DInput/qaxisinput.h> #include <Qt3DInput/private/qaxis_p.h> #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -83,7 +83,7 @@ void Axis::setAxisValue(float axisValue) m_axisValue = axisValue; // Send a change to the frontend - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("value"); e->setValue(m_axisValue); diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index 8d18c9295..d21cad5eb 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -44,7 +44,7 @@ #include "inputhandler_p.h" #include "inputmanagers_p.h" #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <QVariant> QT_BEGIN_NAMESPACE @@ -96,7 +96,7 @@ void KeyboardHandler::setFocus(bool focus) { if (focus != m_focus) { m_focus = focus; - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("focus"); e->setValue(m_focus); @@ -106,7 +106,7 @@ void KeyboardHandler::setFocus(bool focus) void KeyboardHandler::keyEvent(const QKeyEventPtr &event) { - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("event"); e->setValue(QVariant::fromValue(event)); diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index 7ad14f25b..6bb4cb52e 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -46,7 +46,7 @@ #include <Qt3DInput/private/qmousehandler_p.h> #include <Qt3DInput/qmousedevice.h> #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -91,7 +91,7 @@ void MouseHandler::setInputHandler(InputHandler *handler) void MouseHandler::mouseEvent(const QMouseEventPtr &event) { - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("mouse"); e->setValue(QVariant::fromValue(event)); @@ -100,7 +100,7 @@ void MouseHandler::mouseEvent(const QMouseEventPtr &event) void MouseHandler::wheelEvent(const QWheelEventPtr &event) { - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setTargetNode(peerId()); e->setPropertyName("wheel"); e->setValue(QVariant::fromValue(event)); diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index eb9c6793e..20cb45635 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -41,8 +41,8 @@ #include "qkeyboarddevice_p.h" #include "qkeyboardhandler.h" #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -278,7 +278,7 @@ QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent) void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QKeyboardDevice); - Qt3DCore::QBackendScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendScenePropertyChange>(change); + Qt3DCore::QBackendNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendNodePropertyChange>(change); if (e->type() == Qt3DCore::NodeUpdated && e->propertyName() == QByteArrayLiteral("activeInput")) { Qt3DCore::QNodeId activeInputId = e->value().value<Qt3DCore::QNodeId>(); setActiveInput(qobject_cast<QKeyboardHandler *>(d->scene()->lookupNode(activeInputId))); diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 28f80264f..eee57d1fe 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -40,7 +40,7 @@ #include "qkeyboardhandler.h" #include "qkeyboardhandler_p.h" #include "qkeyboarddevice.h" -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -177,7 +177,7 @@ void QKeyboardHandler::copy(const QNode *ref) void QKeyboardHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QKeyboardHandler); - QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); + QBackendNodePropertyChangePtr e = qSharedPointerCast<QBackendNodePropertyChange>(change); if (e->type() == NodeUpdated) { if (e->propertyName() == QByteArrayLiteral("focus")) { bool block = blockNotifications(true); diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 80a77771e..5a592d8a5 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -41,7 +41,7 @@ #include "qmousehandler_p.h" #include "qmousedevice.h" #include "qmouseevent.h" -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -186,7 +186,7 @@ void QMouseHandler::copy(const QNode *ref) void QMouseHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QMouseHandler); - QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); + QBackendNodePropertyChangePtr e = qSharedPointerCast<QBackendNodePropertyChange>(change); if (e->type() == NodeUpdated) { if (e->propertyName() == QByteArrayLiteral("mouse")) { QMouseEventPtr ev = e->value().value<QMouseEventPtr>(); diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp index a782c6b31..ae2f08198 100644 --- a/src/render/backend/boundingvolumedebug.cpp +++ b/src/render/backend/boundingvolumedebug.cpp @@ -39,7 +39,7 @@ #include "boundingvolumedebug_p.h" #include <Qt3DRender/private/qboundingvolumedebug_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DCore/qnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -91,7 +91,7 @@ void BoundingVolumeDebug::setRadius(float radius) { if (m_radius != radius) { m_radius = radius; - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("radius"); e->setTargetNode(peerId()); e->setValue(QVariant(radius)); @@ -103,7 +103,7 @@ void BoundingVolumeDebug::setCenter(const QVector3D ¢er) { if (m_center != center) { m_center = center; - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("center"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(center)); diff --git a/src/render/frontend/qboundingvolumedebug.cpp b/src/render/frontend/qboundingvolumedebug.cpp index 5b6d889bc..7c0494d92 100644 --- a/src/render/frontend/qboundingvolumedebug.cpp +++ b/src/render/frontend/qboundingvolumedebug.cpp @@ -40,7 +40,7 @@ #include "qboundingvolumedebug_p.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qcomponent_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/qspheremesh.h> #include <Qt3DCore/qtransform.h> #include <Qt3DRender/qphongalphamaterial.h> @@ -119,7 +119,7 @@ void QBoundingVolumeDebug::copy(const Qt3DCore::QNode *ref) void QBoundingVolumeDebug::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QBoundingVolumeDebug); - Qt3DCore::QBackendScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendScenePropertyChange>(change); + Qt3DCore::QBackendNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendNodePropertyChange>(change); if (e->type() == Qt3DCore::NodeUpdated) { if (e->propertyName() == QByteArrayLiteral("center")) { d->m_bvCenter = e->value().value<QVector3D>(); diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp index e86b7361d..8a6b6e9ff 100644 --- a/src/render/geometry/buffer.cpp +++ b/src/render/geometry/buffer.cpp @@ -39,7 +39,7 @@ #include "buffer_p.h" #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/private/buffermanager_p.h> #include <Qt3DRender/private/qbuffer_p.h> @@ -88,7 +88,7 @@ void Buffer::executeFunctor() m_data = (*m_functor)(); if (m_syncData) { // Send data back to the frontend - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setPropertyName("data"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(m_data)); diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 8b7d08021..7a07102eb 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -41,7 +41,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/geometryrenderermanager_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/private/qboundingvolume_p.h> #include <Qt3DRender/private/qgeometryrenderer_p.h> @@ -215,7 +215,7 @@ void GeometryRenderer::executeFunctor() Q_ASSERT(m_geometryFactory); QGeometry *geometry = (*m_geometryFactory)(); - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setPropertyName("geometry"); // The Frontend element has to perform the clone // So that the objects are created in the main thread diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index 3bfdc7740..c7cc15d59 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -42,7 +42,7 @@ #include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/qsceneloader.h> #include <Qt3DRender/private/qsceneloader_p.h> #include <Qt3DRender/private/scenemanager_p.h> @@ -100,7 +100,7 @@ void Scene::setSceneSubtree(Qt3DCore::QEntity *subTree) subTree->moveToThread(appThread); // Send the new subtree to the frontend - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setPropertyName("scene"); e->setValue(QVariant::fromValue(subTree)); e->setTargetNode(peerId()); diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp index 4b3db4f9d..dfd09b9a6 100644 --- a/src/render/picking/objectpicker.cpp +++ b/src/render/picking/objectpicker.cpp @@ -42,7 +42,7 @@ #include <Qt3DRender/qobjectpicker.h> #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qnodepropertychange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> QT_BEGIN_NAMESPACE @@ -134,7 +134,7 @@ bool ObjectPicker::isDragEnabled() const void ObjectPicker::onClicked(QPickEventPtr event) { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("clicked"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(event)); @@ -143,7 +143,7 @@ void ObjectPicker::onClicked(QPickEventPtr event) void ObjectPicker::onMoved(QPickEventPtr event) { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("moved"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(event)); @@ -152,7 +152,7 @@ void ObjectPicker::onMoved(QPickEventPtr event) void ObjectPicker::onPressed(QPickEventPtr event) { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("pressed"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(event)); @@ -162,7 +162,7 @@ void ObjectPicker::onPressed(QPickEventPtr event) void ObjectPicker::onReleased(QPickEventPtr event) { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("released"); e->setTargetNode(peerId()); e->setValue(QVariant::fromValue(event)); @@ -172,7 +172,7 @@ void ObjectPicker::onReleased(QPickEventPtr event) void ObjectPicker::onEntered() { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("entered"); e->setTargetNode(peerId()); notifyObservers(e); @@ -180,7 +180,7 @@ void ObjectPicker::onEntered() void ObjectPicker::onExited() { - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(peerId())); e->setPropertyName("exited"); e->setTargetNode(peerId()); notifyObservers(e); diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 3396411d8..132041147 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -40,7 +40,7 @@ #include "qobjectpicker.h" #include <Qt3DCore/qentity.h> #include <Qt3DCore/private/qcomponent_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/qpickevent.h> QT_BEGIN_NAMESPACE @@ -202,7 +202,7 @@ void QObjectPicker::copy(const QNode *ref) void QObjectPicker::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { Q_D(QObjectPicker); - Qt3DCore::QBackendScenePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendScenePropertyChange>(change); + Qt3DCore::QBackendNodePropertyChangePtr e = qSharedPointerCast<Qt3DCore::QBackendNodePropertyChange>(change); if (e->type() == Qt3DCore::NodeUpdated) { // TO DO: Complete this part // to emit the correct signals diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 445e248cb..320f6f8a2 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "textureimage_p.h" -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DCore/qnodepropertychange.h> #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/texturedatamanager_p.h> @@ -180,7 +180,7 @@ void TextureImage::setTextureDataHandle(HTextureData handle) void TextureImage::setStatus(QTextureImage::Status status) { // Notify the frontend - QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId())); + QBackendNodePropertyChangePtr e(new QBackendNodePropertyChange(peerId())); e->setPropertyName("status"); e->setValue(status); e->setTargetNode(peerId()); diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp index d72940143..62e624106 100644 --- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp +++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp @@ -33,7 +33,7 @@ #include <Qt3DCore/private/qpostman_p.h> #include <Qt3DCore/qnodepropertychange.h> #include <Qt3DCore/qscenechange.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qnode.h> #include <Qt3DCore/qbackendnode.h> @@ -179,7 +179,7 @@ public: QVERIFY(!e.isNull()); m_lastChanges << e; // Save reply to be sent to the frontend - m_reply.reset(new Qt3DCore::QBackendScenePropertyChange(e->subjectId())); + m_reply.reset(new Qt3DCore::QBackendNodePropertyChange(e->subjectId())); m_reply->setTargetNode(e->subjectId()); m_reply->setPropertyName("Reply"); } @@ -206,7 +206,7 @@ public: private: QList<Qt3DCore::QSceneChangePtr> m_lastChanges; - Qt3DCore::QBackendScenePropertyChangePtr m_reply; + Qt3DCore::QBackendNodePropertyChangePtr m_reply; }; @@ -256,7 +256,7 @@ public: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QVERIFY(!e.isNull()); - Qt3DCore::QBackendScenePropertyChangePtr change = qSharedPointerDynamicCast<Qt3DCore::QBackendScenePropertyChange>(e); + Qt3DCore::QBackendNodePropertyChangePtr change = qSharedPointerDynamicCast<Qt3DCore::QBackendNodePropertyChange>(e); QVERIFY(!change.isNull()); Qt3DCore::QNode *targetNode = m_sceneInterface->lookupNode(change->targetNode()); QVERIFY(targetNode != Q_NULLPTR); @@ -778,7 +778,7 @@ void tst_QChangeArbiter::distributeBackendChanges() QCOMPARE(postman->lastChanges().count(), 1); // verify correctness of the reply - Qt3DCore::QBackendScenePropertyChangePtr c = qSharedPointerDynamicCast<Qt3DCore::QBackendScenePropertyChange>(postman->lastChange()); + Qt3DCore::QBackendNodePropertyChangePtr c = qSharedPointerDynamicCast<Qt3DCore::QBackendNodePropertyChange>(postman->lastChange()); QVERIFY(!c.isNull()); QVERIFY(c->targetNode() == root->id()); qDebug() << c->propertyName(); diff --git a/tests/auto/render/picking/tst_picking.cpp b/tests/auto/render/picking/tst_picking.cpp index d31219d3f..cf8c16eba 100644 --- a/tests/auto/render/picking/tst_picking.cpp +++ b/tests/auto/render/picking/tst_picking.cpp @@ -40,7 +40,7 @@ #include <Qt3DRender/qbufferdatagenerator.h> #include <Qt3DRender/qspheregeometry.h> #include <Qt3DRender/qpickevent.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> using namespace Qt3DCore; using namespace Qt3DRender; @@ -144,7 +144,7 @@ private Q_SLOTS: Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); QVariant v; v.setValue<Qt3DRender::QPickEventPtr>(event); - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(child11.id())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(child11.id())); e->setPropertyName("pressed"); e->setValue(v); child11.picker->sceneChangeEvent(e); @@ -192,7 +192,7 @@ private Q_SLOTS: Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); QVariant v; v.setValue<Qt3DRender::QPickEventPtr>(event); - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(child11.id())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(child11.id())); e->setPropertyName("pressed"); e->setValue(v); child11.picker->sceneChangeEvent(e); @@ -236,7 +236,7 @@ private Q_SLOTS: Qt3DRender::QPickEventPtr event(new Qt3DRender::QPickEvent()); QVariant v; v.setValue<Qt3DRender::QPickEventPtr>(event); - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(child11.id())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(child11.id())); e->setPropertyName("clicked"); e->setValue(v); child11.picker->sceneChangeEvent(e); diff --git a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp index 681040184..f5c1fc1ae 100644 --- a/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp +++ b/tests/auto/render/qboundingvolumedebug/tst_qboundingvolumedebug.cpp @@ -30,7 +30,7 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/private/qboundingvolumedebug_p.h> #include "testpostmanarbiter.h" @@ -150,7 +150,7 @@ private Q_SLOTS: // WHEN // Create Backend Change and distribute it to frontend node - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(bvD->id())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(bvD->id())); e->setPropertyName("center"); bvD->sceneChangeEvent(e); QCoreApplication::processEvents(); diff --git a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp index 805c7c89b..bd5a9f323 100644 --- a/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp +++ b/tests/auto/render/qobjectpicker/tst_qobjectpicker.cpp @@ -30,7 +30,7 @@ #include <QtTest/QSignalSpy> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qbackendscenepropertychange.h> +#include <Qt3DCore/qbackendnodepropertychange.h> #include <Qt3DRender/QObjectPicker> #include <Qt3DRender/QPickEvent> @@ -164,7 +164,7 @@ private Q_SLOTS: // WHEN // Create Backend Change and distribute it to frontend node - Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(objectPicker->id())); + Qt3DCore::QBackendNodePropertyChangePtr e(new Qt3DCore::QBackendNodePropertyChange(objectPicker->id())); e->setPropertyName(propertyName.constData()); if (requiresEvent) { |