summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/boundingvolumedebug.cpp6
-rw-r--r--src/render/frontend/qboundingvolumedebug.cpp4
-rw-r--r--src/render/geometry/buffer.cpp4
-rw-r--r--src/render/geometry/geometryrenderer.cpp4
-rw-r--r--src/render/io/scene.cpp4
-rw-r--r--src/render/picking/objectpicker.cpp14
-rw-r--r--src/render/picking/qobjectpicker.cpp4
-rw-r--r--src/render/texture/textureimage.cpp4
8 files changed, 22 insertions, 22 deletions
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 &center)
{
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());
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 17:58:10 +0000