summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/framegraph/qblitframebuffer.h2
-rw-r--r--src/render/framegraph/qcameraselector.h1
-rw-r--r--src/render/framegraph/qproximityfilter.h1
-rw-r--r--src/render/framegraph/qrendertargetselector.h2
-rw-r--r--src/render/frontend/qcamera.h6
-rw-r--r--src/render/frontend/qlevelofdetail.h2
-rw-r--r--src/render/materialsystem/qmaterial.h4
-rw-r--r--src/render/materialsystem/qshaderimage.h2
-rw-r--r--src/render/materialsystem/qshaderprogrambuilder.h2
-rw-r--r--src/render/picking/qpickevent.h8
-rw-r--r--src/render/raycasting/qraycastingservice.cpp5
-rw-r--r--src/render/renderstates/qstenciloperation.h2
-rw-r--r--src/render/renderstates/qstenciltest.h2
-rw-r--r--src/render/texture/qabstracttexture.h2
14 files changed, 18 insertions, 23 deletions
diff --git a/src/render/framegraph/qblitframebuffer.h b/src/render/framegraph/qblitframebuffer.h
index 22c422928..75943ee2c 100644
--- a/src/render/framegraph/qblitframebuffer.h
+++ b/src/render/framegraph/qblitframebuffer.h
@@ -42,6 +42,7 @@
#include <Qt3DRender/qframegraphnode.h>
#include <Qt3DRender/qrendertargetoutput.h>
+#include <Qt3DRender/qrendertarget.h>
#include <QtCore/QRect>
QT_BEGIN_NAMESPACE
@@ -49,7 +50,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QBlitFramebufferPrivate;
-class QRenderTarget;
class Q_3DRENDERSHARED_EXPORT QBlitFramebuffer : public QFrameGraphNode
{
diff --git a/src/render/framegraph/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 61d730f57..99e108af0 100644
--- a/src/render/framegraph/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
@@ -40,6 +40,7 @@
#ifndef QT3DRENDER_QCAMERASELECTOR_H
#define QT3DRENDER_QCAMERASELECTOR_H
+#include <Qt3DCore/qentity.h>
#include <Qt3DRender/qt3drender_global.h>
#include <Qt3DRender/qframegraphnode.h>
diff --git a/src/render/framegraph/qproximityfilter.h b/src/render/framegraph/qproximityfilter.h
index 56b48c46f..860807773 100644
--- a/src/render/framegraph/qproximityfilter.h
+++ b/src/render/framegraph/qproximityfilter.h
@@ -40,6 +40,7 @@
#ifndef QT3DRENDER_QPROXIMITYFILTER_H
#define QT3DRENDER_QPROXIMITYFILTER_H
+#include <Qt3DCore/qentity.h>
#include <Qt3DRender/qframegraphnode.h>
QT_BEGIN_NAMESPACE
diff --git a/src/render/framegraph/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index cb6c679ff..84fdfe82e 100644
--- a/src/render/framegraph/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
@@ -44,13 +44,13 @@
#include <Qt3DCore/qnode.h>
#include <Qt3DRender/qframegraphnode.h>
#include <Qt3DRender/qrendertargetoutput.h>
+#include <Qt3DRender/qrendertarget.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QRenderTargetSelectorPrivate;
-class QRenderTarget;
class Q_3DRENDERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode
{
diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h
index b57f57957..82a1c04bd 100644
--- a/src/render/frontend/qcamera.h
+++ b/src/render/frontend/qcamera.h
@@ -41,6 +41,7 @@
#define QT3DRENDER_CAMERA_H
#include <Qt3DCore/qentity.h>
+#include <Qt3DCore/qtransform.h>
#include <Qt3DRender/qt3drender_global.h>
#include <Qt3DRender/qcameralens.h>
#include <QtGui/QMatrix4x4>
@@ -49,11 +50,6 @@
QT_BEGIN_NAMESPACE
-namespace Qt3DCore {
-class QEntity;
-class QTransform;
-}
-
namespace Qt3DRender {
class QCameraPrivate;
diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h
index 1192ff1e8..f31c90db7 100644
--- a/src/render/frontend/qlevelofdetail.h
+++ b/src/render/frontend/qlevelofdetail.h
@@ -43,6 +43,7 @@
#include <Qt3DCore/qcomponent.h>
#include <Qt3DRender/qt3drender_global.h>
#include <Qt3DRender/qlevelofdetailboundingsphere.h>
+#include <Qt3DRender/qcamera.h>
#include <QtGui/QVector3D>
@@ -50,7 +51,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QCamera;
class QLevelOfDetailPrivate;
class Q_3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index 74feb3675..2d306d016 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -44,15 +44,15 @@
#include <Qt3DCore/qcomponent.h>
#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qabstracttexture.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QAbstractTexture;
class QParameter;
class QMaterialPrivate;
-class QEffect;
class Q_3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
{
diff --git a/src/render/materialsystem/qshaderimage.h b/src/render/materialsystem/qshaderimage.h
index cc9d3c728..de323f6c6 100644
--- a/src/render/materialsystem/qshaderimage.h
+++ b/src/render/materialsystem/qshaderimage.h
@@ -42,12 +42,12 @@
#include <Qt3DCore/qnode.h>
#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qabstracttexture.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QAbstractTexture;
class QShaderImagePrivate;
class Q_3DRENDERSHARED_EXPORT QShaderImage : public Qt3DCore::QNode
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h
index fa8f77ea0..2280306b3 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.h
+++ b/src/render/materialsystem/qshaderprogrambuilder.h
@@ -42,6 +42,7 @@
#include <Qt3DCore/qnode.h>
#include <Qt3DRender/qt3drender_global.h>
+#include <Qt3DRender/qshaderprogram.h>
#include <QtCore/qurl.h>
@@ -49,7 +50,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QShaderProgram;
class QShaderProgramBuilderPrivate;
class Q_3DRENDERSHARED_EXPORT QShaderProgramBuilder : public Qt3DCore::QNode
diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h
index 854008aaf..0733499bf 100644
--- a/src/render/picking/qpickevent.h
+++ b/src/render/picking/qpickevent.h
@@ -43,19 +43,15 @@
#include <QtCore/QObject>
#include <QtGui/QVector3D>
#include <QtCore/QPointF>
+#include <Qt3DCore/qentity.h>
+#include <Qt3DRender/qviewport.h>
#include <Qt3DRender/qt3drender_global.h>
QT_BEGIN_NAMESPACE
-namespace Qt3DCore {
-class QEntity;
-}
-
namespace Qt3DRender {
-class QViewport;
class QPickEventPrivate;
-
class QPickEvent;
typedef QSharedPointer<QPickEvent> QPickEventPtr;
diff --git a/src/render/raycasting/qraycastingservice.cpp b/src/render/raycasting/qraycastingservice.cpp
index bdb1557f7..e9a88e3a3 100644
--- a/src/render/raycasting/qraycastingservice.cpp
+++ b/src/render/raycasting/qraycastingservice.cpp
@@ -194,8 +194,9 @@ QQueryHandle QRayCastingService::query(const QRay3D &ray,
// Blocking mapReduce
#if QT_CONFIG(concurrent)
- FutureQueryResult future = QtConcurrent::run(d, &QRayCastingServicePrivate::collides,
- ray, provider, mode, handle);
+ FutureQueryResult future = QtConcurrent::run([d, ray, provider, mode, handle]{
+ return d->collides(ray, provider, mode, handle);
+ });
d->m_results.insert(handle, future);
#else
d->m_results.insert(handle, d->collides(ray, provider, mode, handle));
diff --git a/src/render/renderstates/qstenciloperation.h b/src/render/renderstates/qstenciloperation.h
index 3e2cbacea..313d1726b 100644
--- a/src/render/renderstates/qstenciloperation.h
+++ b/src/render/renderstates/qstenciloperation.h
@@ -41,13 +41,13 @@
#define QT3DRENDER_QSTENCILOPERATION_H
#include <Qt3DRender/qrenderstate.h>
+#include <Qt3DRender/qstenciloperationarguments.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QStencilOperationPrivate;
-class QStencilOperationArguments;
class Q_3DRENDERSHARED_EXPORT QStencilOperation : public QRenderState
{
diff --git a/src/render/renderstates/qstenciltest.h b/src/render/renderstates/qstenciltest.h
index 1faaa524c..518255dbe 100644
--- a/src/render/renderstates/qstenciltest.h
+++ b/src/render/renderstates/qstenciltest.h
@@ -42,13 +42,13 @@
#define QT3DRENDER_QSTENCILTEST_H
#include <Qt3DRender/qrenderstate.h>
+#include <Qt3DRender/qstenciltestarguments.h>
QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QStencilTestPrivate;
-class QStencilTestArguments;
class Q_3DRENDERSHARED_EXPORT QStencilTest : public QRenderState
{
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index 37329b61a..f46344eff 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -41,6 +41,7 @@
#define QT3DRENDER_QABSTRACTTEXTURE_H
#include <Qt3DRender/qtextureimagedata.h>
+#include <Qt3DRender/qtexturewrapmode.h>
#include <Qt3DRender/qt3drender_global.h>
#include <Qt3DCore/qnode.h>
@@ -49,7 +50,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
class QAbstractTexturePrivate;
-class QTextureWrapMode;
class QAbstractTextureImage;
class QTextureDataUpdate;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 22:46:00 +0000