summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qrendersettings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/frontend/qrendersettings.cpp')
-rw-r--r--src/render/frontend/qrendersettings.cpp35
1 files changed, 25 insertions, 10 deletions
diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp
index d106e4205..179df151a 100644
--- a/src/render/frontend/qrendersettings.cpp
+++ b/src/render/frontend/qrendersettings.cpp
@@ -39,6 +39,7 @@
#include "qrendersettings.h"
#include "qrendersettings_p.h"
+#include "qrendercapabilities.h"
#include "qframegraphnode.h"
#include "qrendersurfaceselector.h"
#include "qrendersurfaceselector_p.h"
@@ -104,25 +105,25 @@ void QRenderSettingsPrivate::invalidateFrame()
/*! \internal */
void QRenderSettingsPrivate::_q_onPickingMethodChanged(QPickingSettings::PickMethod pickMethod)
{
- notifyPropertyChange("pickMethod", pickMethod);// TODOSYNC
+ notifyPropertyChange("pickMethod", pickMethod);
}
/*! \internal */
void QRenderSettingsPrivate::_q_onPickResultModeChanged(QPickingSettings::PickResultMode pickResultMode)
{
- notifyPropertyChange("pickResultMode", pickResultMode);// TODOSYNC
+ notifyPropertyChange("pickResultMode", pickResultMode);
}
/*! \internal */
void QRenderSettingsPrivate::_q_onFaceOrientationPickingModeChanged(QPickingSettings::FaceOrientationPickingMode faceOrientationPickingMode)
{
- notifyPropertyChange("faceOrientationPickingMode", faceOrientationPickingMode);// TODOSYNC
+ notifyPropertyChange("faceOrientationPickingMode", faceOrientationPickingMode);
}
/*! \internal */
void QRenderSettingsPrivate::_q_onWorldSpaceToleranceChanged(float worldSpaceTolerance)
{
- notifyPropertyChange("pickWorldSpaceTolerance", worldSpaceTolerance);// TODOSYNC
+ notifyPropertyChange("pickWorldSpaceTolerance", worldSpaceTolerance);
}
QRenderSettings::QRenderSettings(Qt3DCore::QNode *parent)
@@ -142,6 +143,26 @@ QRenderSettings::~QRenderSettings()
}
/*!
+ \qmlproperty RenderCapabilities RenderSettings::renderCapabilities
+
+ Holds the details of the supported rendering engine
+
+ \readonly
+*/
+/*!
+ \property QRenderSettings::renderCapabilities
+
+ Holds the details of the supported rendering engine
+
+ \readonly
+*/
+QRenderCapabilities *QRenderSettings::renderCapabilities()
+{
+ Q_D(QRenderSettings);
+ return &(d->m_renderCapabilities);
+}
+
+/*!
\qmlproperty PickingSettings RenderSettings::pickingSettings
Holds the current pick settings for the \l{Qt 3D Render Framegraph}{FrameGraph}.
@@ -161,12 +182,6 @@ QPickingSettings *QRenderSettings::pickingSettings()
return &(d->m_pickingSettings);
}
-const QPickingSettings *QRenderSettings::pickingSettings() const
-{
- Q_D(const QRenderSettings);
- return &(d->m_pickingSettings);
-}
-
/*!
\qmlproperty FrameGraphNode RenderSettings::activeFrameGraph