summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/scene3d/scene3ditem_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3ditem_p.h')
-rw-r--r--src/quick3d/imports/scene3d/scene3ditem_p.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index a23bb9e5b..ae7a4600e 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -78,6 +78,7 @@ class Scene3DItem : public QQuickItem
Q_PROPERTY(bool multisample READ multisample WRITE setMultisample NOTIFY multisampleChanged)
Q_PROPERTY(CameraAspectRatioMode cameraAspectRatioMode READ cameraAspectRatioMode WRITE setCameraAspectRatioMode NOTIFY cameraAspectRatioModeChanged)
Q_PROPERTY(bool hoverEnabled READ isHoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged)
+ Q_PROPERTY(CompositingMode compositingMode READ compositingMode WRITE setCompositingMode NOTIFY compositingModeChanged REVISION 14)
Q_CLASSINFO("DefaultProperty", "entity")
public:
explicit Scene3DItem(QQuickItem *parent = 0);
@@ -98,11 +99,19 @@ public:
Q_ENUM(CameraAspectRatioMode); // LCOV_EXCL_LINE
CameraAspectRatioMode cameraAspectRatioMode() const;
+ enum CompositingMode {
+ FBO,
+ Underlay
+ };
+ Q_ENUM(CompositingMode) // LCOV_EXCL_LINE
+ CompositingMode compositingMode() const;
+
public Q_SLOTS:
void setAspects(const QStringList &aspects);
void setEntity(Qt3DCore::QEntity *entity);
void setCameraAspectRatioMode(CameraAspectRatioMode mode);
void setHoverEnabled(bool enabled);
+ void setCompositingMode(CompositingMode mode);
Q_SIGNALS:
void aspectsChanged();
@@ -110,6 +119,7 @@ Q_SIGNALS:
void multisampleChanged();
void cameraAspectRatioModeChanged(CameraAspectRatioMode mode);
void hoverEnabledChanged();
+ void compositingModeChanged();
private Q_SLOTS:
void applyRootEntityChange();
@@ -133,9 +143,12 @@ private:
bool m_multisample;
bool m_dirty;
+ bool m_clearsWindowByDefault;
+ bool m_disableClearWindow;
QPointer<Qt3DRender::QCamera> m_camera;
CameraAspectRatioMode m_cameraAspectRatioMode;
+ CompositingMode m_compositingMode;
QOffscreenSurface *m_dummySurface;
};