summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/boundingvolumedebug.cpp5
-rw-r--r--src/render/geometry/buffer.cpp2
-rw-r--r--src/render/geometry/geometryrenderer.cpp2
-rw-r--r--src/render/io/scene.cpp2
-rw-r--r--src/render/picking/objectpicker.cpp12
-rw-r--r--src/render/texture/textureimage.cpp2
6 files changed, 13 insertions, 12 deletions
diff --git a/src/render/backend/boundingvolumedebug.cpp b/src/render/backend/boundingvolumedebug.cpp
index d1259fe06..a782c6b31 100644
--- a/src/render/backend/boundingvolumedebug.cpp
+++ b/src/render/backend/boundingvolumedebug.cpp
@@ -40,6 +40,7 @@
#include "boundingvolumedebug_p.h"
#include <Qt3DRender/private/qboundingvolumedebug_p.h>
#include <Qt3DCore/qbackendscenepropertychange.h>
+#include <Qt3DCore/qnodepropertychange.h>
QT_BEGIN_NAMESPACE
@@ -90,7 +91,7 @@ void BoundingVolumeDebug::setRadius(float radius)
{
if (m_radius != radius) {
m_radius = radius;
- Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
e->setPropertyName("radius");
e->setTargetNode(peerId());
e->setValue(QVariant(radius));
@@ -102,7 +103,7 @@ void BoundingVolumeDebug::setCenter(const QVector3D &center)
{
if (m_center != center) {
m_center = center;
- Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
e->setPropertyName("center");
e->setTargetNode(peerId());
e->setValue(QVariant::fromValue(center));
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 9d9ac892c..e86b7361d 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -88,7 +88,7 @@ void Buffer::executeFunctor()
m_data = (*m_functor)();
if (m_syncData) {
// Send data back to the frontend
- QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+ QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(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 4af82c611..8b7d08021 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -215,7 +215,7 @@ void GeometryRenderer::executeFunctor()
Q_ASSERT(m_geometryFactory);
QGeometry *geometry = (*m_geometryFactory)();
- QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+ QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(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 51a17efb9..3bfdc7740 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -100,7 +100,7 @@ void Scene::setSceneSubtree(Qt3DCore::QEntity *subTree)
subTree->moveToThread(appThread);
// Send the new subtree to the frontend
- QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+ QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(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 cabc2f849..4b3db4f9d 100644
--- a/src/render/picking/objectpicker.cpp
+++ b/src/render/picking/objectpicker.cpp
@@ -134,7 +134,7 @@ bool ObjectPicker::isDragEnabled() const
void ObjectPicker::onClicked(QPickEventPtr event)
{
- Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(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(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(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(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(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(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(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(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(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(Qt3DCore::NodeUpdated, peerId()));
+ Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(peerId()));
e->setPropertyName("exited");
e->setTargetNode(peerId());
notifyObservers(e);
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index fcc3accee..445e248cb 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -180,7 +180,7 @@ void TextureImage::setTextureDataHandle(HTextureData handle)
void TextureImage::setStatus(QTextureImage::Status status)
{
// Notify the frontend
- QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerId()));
+ QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(peerId()));
e->setPropertyName("status");
e->setValue(status);
e->setTargetNode(peerId());